diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
index 65f716e71b..1eac039747 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -1,6 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-config BOARD_HP_SNB_IVB_LAPTOPS
+config BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	def_bool n
 	select EC_HP_KBC1126
 	select HAVE_ACPI_RESUME
@@ -14,7 +14,7 @@ config BOARD_HP_SNB_IVB_LAPTOPS
 	select SYSTEM_TYPE_LAPTOP
 	select USE_NATIVE_RAMINIT
 
-if BOARD_HP_SNB_IVB_LAPTOPS
+if BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 
 config MAINBOARD_DIR
 	default "hp/snb_ivb_laptops"
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
index 5eb1f49245..9f57279c21 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
@@ -3,7 +3,7 @@
 config BOARD_HP_2560P
 	bool "EliteBook 2560p"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_8192
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
@@ -15,7 +15,7 @@ config BOARD_HP_2560P
 config BOARD_HP_2570P
 	bool "EliteBook 2570p"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_16384
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
@@ -26,7 +26,7 @@ config BOARD_HP_2570P
 config BOARD_HP_2760P
 	bool "EliteBook 2760p"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_8192
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
@@ -37,7 +37,7 @@ config BOARD_HP_2760P
 config BOARD_HP_8460P
 	bool "EliteBook 8460p"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_8192
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
@@ -49,7 +49,7 @@ config BOARD_HP_8460P
 config BOARD_HP_8470P
 	bool "EliteBook 8470p"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_16384
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_INT15
@@ -61,7 +61,7 @@ config BOARD_HP_8470P
 config BOARD_HP_8770W
 	bool "EliteBook 8770w"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_16384
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select SOUTHBRIDGE_INTEL_C216
@@ -70,7 +70,7 @@ config BOARD_HP_8770W
 config BOARD_HP_FOLIO_9470M
 	bool "EliteBook Folio 9470m"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_16384
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
@@ -82,7 +82,7 @@ config BOARD_HP_FOLIO_9470M
 config BOARD_HP_PROBOOK_6360B
 	bool "ProBook 6360b"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_4096
 	select GFX_GMA_PANEL_1_ON_LVDS
 	select INTEL_GMA_HAVE_VBT
@@ -97,7 +97,7 @@ config BOARD_HP_PROBOOK_6360B
 config BOARD_HP_REVOLVE_810_G1
 	bool "EliteBook Revolve 810 G1"
 
-	select BOARD_HP_SNB_IVB_LAPTOPS
+	select BOARD_HP_SNB_IVB_LAPTOPS_COMMON
 	select BOARD_ROMSIZE_KB_16384
 	select HAVE_SPD_IN_CBFS
 	select GFX_GMA_PANEL_1_ON_LVDS