diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig
index 4b5a4ef97c..32c9487052 100644
--- a/src/mainboard/intel/cannonlake_rvp/Kconfig
+++ b/src/mainboard/intel/cannonlake_rvp/Kconfig
@@ -10,6 +10,9 @@ config BOARD_SPECIFIC_OPTIONS
 	select GENERIC_SPD_BIN
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_GENERIC
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98373
+	select DRIVERS_GENERIC_MAX98357A
 	select SOC_INTEL_CANNONLAKE
 	select MAINBOARD_USES_IFD_EC_REGION
 	select INTEL_LPSS_UART_FOR_CONSOLE
@@ -42,8 +45,6 @@ config DEVICETREE
 
 config INCLUDE_SND_MAX98357_DA7219_NHLT
 	bool "Include blobs for audio with MAX98357_DA7219"
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
 	select NHLT_DMIC_4CH_16B
 	select NHLT_DMIC_2CH_16B
 	select NHLT_DA7219
@@ -51,7 +52,6 @@ config INCLUDE_SND_MAX98357_DA7219_NHLT
 
 config INCLUDE_SND_MAX98373_NHLT
 	bool "Include blobs for audio with MAX98373"
-	select DRIVERS_I2C_MAX98373
 	select NHLT_DMIC_4CH_16B
 	select NHLT_DMIC_2CH_16B
 	select NHLT_MAX98373