dm: exynos: Move driver model CONFIGs to Kconfig

Remove driver model CONFIGs from the board config headers and use Kconfig
instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 7fcb5d2094ec7e51144325085774fca4a00a9256..17ad567c190d96ff909fafa06e7ba57a9a497107 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -65,6 +65,21 @@ endchoice
 config SYS_SOC
        default "exynos"
 
+config DM
+       default y if !SPL_BUILD
+
+config DM_SERIAL
+       default y if !SPL_BUILD
+
+config DM_SPI
+       default y if !SPL_BUILD
+
+config DM_SPI_FLASH
+       default y if !SPL_BUILD
+
+config DM_GPIO
+       default y if !SPL_BUILD
+
 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"
 source "board/samsung/universal_c210/Kconfig"

diff --git a/board/samsung/goni/Kconfig b/board/samsung/goni/Kconfig
index cbbf5a93156e418f80d560ed6f8d754f3d7b37ac..2c5d3fc3be54cc9ebc8727846c3f89d16bcd575f 100644 (file)
--- a/board/samsung/goni/Kconfig
+++ b/board/samsung/goni/Kconfig
@@ -12,4 +12,13 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "s5p_goni"
 
+config DM
+       default y if !SPL_BUILD
+
+config DM_GPIO
+       default y if !SPL_BUILD
+
+config DM_SERIAL
+       default y if !SPL_BUILD
+
 endif

diff --git a/board/samsung/smdk5420/Kconfig b/board/samsung/smdk5420/Kconfig
index a9d62fffa55ebfdbdfa1516a0c0fff7108237c4c..576abaea698bb6ff5adf1098b3e22ac328c88ef9 100644 (file)
--- a/board/samsung/smdk5420/Kconfig
+++ b/board/samsung/smdk5420/Kconfig
@@ -22,6 +22,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "peach-pi"
 
+config DM_CROS_EC
+       default y
+
 endif
 
 if TARGET_PEACH_PIT
@@ -35,6 +38,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "peach-pit"
 
+config DM_CROS_EC
+       default y
+
 endif
 
 if TARGET_SMDK5420

diff --git a/board/samsung/smdkc100/Kconfig b/board/samsung/smdkc100/Kconfig
index d2157b4d05f62cc4a5f9da9c0a0ec79eb719f79b..996fe3cc4506a410211ef998c1d30ef14d7e9652 100644 (file)
--- a/board/samsung/smdkc100/Kconfig
+++ b/board/samsung/smdkc100/Kconfig
@@ -12,4 +12,13 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "smdkc100"
 
+config DM
+       default y if !SPL_BUILD
+
+config DM_GPIO
+       default y if !SPL_BUILD
+
+config DM_SERIAL
+       default y if !SPL_BUILD
+
 endif

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 1f3ee55098fc8f8289cd882eceecbfa66b8147d6..2c4f35af9fe3ea372ecab49cc772489e1ca83a6c 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -17,12 +17,6 @@
 #include <linux/sizes.h>
 
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
-#define CONFIG_DM_SPI
-#define CONFIG_DM_SPI_FLASH
 
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_DISPLAY_CPUINFO

diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index a1c980d320259a380465a934d190e71538a4e0c1..f724164d89850ff7b2e4170792a76b6926abaf6b 100644 (file)
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -44,7 +44,6 @@
 
 #define CONFIG_POWER_TPS65090_EC
 #define CONFIG_CROS_EC_SPI             /* Support CROS_EC over SPI */
-#define CONFIG_DM_CROS_EC
 
 #define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_EXYNOS

diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 6516a727642f3afaad3c8c04249e75d1eabbcdf2..de12a9e1b18ffc6cd0d726554699fef58621806b 100644 (file)
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -44,7 +44,6 @@
 
 #define CONFIG_POWER_TPS65090_EC
 #define CONFIG_CROS_EC_SPI             /* Support CROS_EC over SPI */
-#define CONFIG_DM_CROS_EC
 
 #define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_EXYNOS

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index dfa2e079480ed37a032e153fd1e5fd1ffb72a354..26167a4ece790f5d1b292b7db82c615726e2777f 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -290,9 +290,5 @@
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 982d0dcea397737fa5aca1dc1b167c213c163858..a7eb33ed43f4856c31f0c9f20cafa38082916353 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -224,9 +224,5 @@
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
 
 #endif /* __CONFIG_H */