dm: x86: 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/x86/Kconfig b/arch/x86/Kconfig
index fef11f35528f4c830ade43d469d1e52ae89f6bac..bb3ff4393eaadc44c3f2f52c53a1924794711dde 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -67,6 +67,15 @@ config TARGET_GALILEO
 
 endchoice
 
+config DM
+       default y
+
+config DM_GPIO
+       default y
+
+config DM_SERIAL
+       default y
+
 config RAMBASE
        hex
        default 0x100000

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 062e6c22198220659aed670f598c99bc203eb6eb..277a95c199a6185009a6e7aab553b0e34c3fbd07 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -22,11 +22,6 @@
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_DISPLAY_CPUINFO
 
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
-
 #define CONFIG_LMB
 #define CONFIG_OF_LIBFDT