summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-05 21:41:41 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:34 -0700
commit9a89d50d8eca3db64ecd71db2d3273a5c57bbdb1 (patch)
tree8a96ab4cb6695954626c571d2397eda4f2d7b7d9
parentaab7e80d5fbc3aeb5feddae88c9cbb649d23345a (diff)
downloadblackbird-obmc-uboot-9a89d50d8eca3db64ecd71db2d3273a5c57bbdb1.tar.gz
blackbird-obmc-uboot-9a89d50d8eca3db64ecd71db2d3273a5c57bbdb1.zip
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>
-rw-r--r--arch/x86/Kconfig9
-rw-r--r--include/configs/x86-common.h5
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fef11f3552..bb3ff4393e 100644
--- 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 062e6c2219..277a95c199 100644
--- 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
OpenPOWER on IntegriCloud