diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index c2584f31c7..5a1ae43e1e 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -13,6 +13,10 @@ config BOARD_INTEL_BASEBOARD_GLKRVP
 	select DRIVERS_I2C_DA7219
 	select SOC_ESPI
 
+config BOARD_INTEL_GLKRVP
+	select BOARD_INTEL_BASEBOARD_GLKRVP
+	select BASEBOARD_GLKRVP_LAPTOP
+
 if BOARD_INTEL_BASEBOARD_GLKRVP
 
 config BASEBOARD_GLKRVP_LAPTOP
diff --git a/src/mainboard/intel/glkrvp/Kconfig.name b/src/mainboard/intel/glkrvp/Kconfig.name
index b0cfdc5fa2..0502c4c18c 100644
--- a/src/mainboard/intel/glkrvp/Kconfig.name
+++ b/src/mainboard/intel/glkrvp/Kconfig.name
@@ -1,4 +1,2 @@
 config BOARD_INTEL_GLKRVP
 	bool "Glkrvp"
-	select BOARD_INTEL_BASEBOARD_GLKRVP
-	select BASEBOARD_GLKRVP_LAPTOP