diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 7e470d6b87..6a0b98712c 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -77,6 +77,7 @@ config BOARD_GOOGLE_BOTEN
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_BOXY
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
@@ -93,6 +94,7 @@ config BOARD_GOOGLE_BUGZZY
 	select DRIVERS_I2C_SX9360
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_CAPPY2
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
@@ -143,10 +145,11 @@ config BOARD_GOOGLE_DRAWCIA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select DRIVERS_INTEL_MIPI_CAMERA
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_DRIBLEE
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
@@ -182,6 +185,7 @@ config BOARD_GOOGLE_KRACKO
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_LALALA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
@@ -202,6 +206,7 @@ config BOARD_GOOGLE_MADOO
 	select DRIVERS_GENERIC_MAX98357A
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_MAGOLOR
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
@@ -211,11 +216,13 @@ config BOARD_GOOGLE_MAGOLOR
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_METAKNIGHT
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select INTEL_GMA_HAVE_VBT
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_PIRIKA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
@@ -246,9 +253,10 @@ config BOARD_GOOGLE_STORO
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select DRIVERS_INTEL_MIPI_CAMERA
-	select SOC_INTEL_COMMON_BLOCK_IPU
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SYSTEM_TYPE_CONVERTIBLE
 
 config BOARD_GOOGLE_TARANZA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
@@ -279,7 +287,7 @@ if BOARD_GOOGLE_BASEBOARD_DEDEDE
 config BASEBOARD_DEDEDE_LAPTOP
 	def_bool n
 	select DRIVERS_GFX_GENERIC
-	select SYSTEM_TYPE_LAPTOP
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_CONVERTIBLE
 
 config CHROMEOS
 	select CHROMEOS_CSE_BOARD_RESET_OVERRIDE if BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c
index a668412003..39b408884b 100644
--- a/src/mainboard/google/dedede/mainboard.c
+++ b/src/mainboard/google/dedede/mainboard.c
@@ -87,7 +87,8 @@ static void mainboard_init(void *chip_info)
 	 * For chromeboxes, wait for DP HPD to be asserted before
 	 * entering FSP-S, otherwise display init may fail.
 	 */
-	if (!CONFIG(SYSTEM_TYPE_LAPTOP) && display_init_required())
+	if (!CONFIG(SYSTEM_TYPE_LAPTOP) && !CONFIG(SYSTEM_TYPE_CONVERTIBLE) &&
+	    display_init_required())
 		mainboard_wait_for_hpd();
 
 	base_pads = baseboard_gpio_table(&base_num);