diff mbox

[U-Boot,v2,14/19] dm: sandbox: Move driver model CONFIGs to Kconfig

Message ID 1423197710-1568-15-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Feb. 6, 2015, 4:41 a.m. UTC 
Remove driver model CONFIGs from the board config headers and use Kconfig
instead.

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

Changes in v2: None

 arch/sandbox/Kconfig      | 24 ++++++++++++++++++++++++
 include/configs/sandbox.h | 11 -----------
 2 files changed, 24 insertions(+), 11 deletions(-)

Comments

Simon Glass Feb. 11, 2015, 7:46 p.m. UTC | #1 
On 5 February 2015 at 21:41, Simon Glass <sjg@chromium.org> wrote:
> Remove driver model CONFIGs from the board config headers and use Kconfig
> instead.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  arch/sandbox/Kconfig      | 24 ++++++++++++++++++++++++
>  include/configs/sandbox.h | 11 -----------
>  2 files changed, 24 insertions(+), 11 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 3057325..2098b9c 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -10,4 +10,28 @@  config SYS_BOARD
 config SYS_CONFIG_NAME
 	default "sandbox"
 
+config DM
+	default y
+
+config DM_GPIO
+	default y
+
+config DM_SERIAL
+	default y
+
+config DM_CROS_EC
+	default y
+
+config DM_SPI
+	default y
+
+config DM_SPI_FLASH
+	default y
+
+config DM_I2C
+	default y
+
+config DM_TEST
+	default y
+
 endmenu
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index deff4d6..bff0170 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -23,14 +23,6 @@ 
 
 #define CONFIG_BOOTSTAGE
 #define CONFIG_BOOTSTAGE_REPORT
-#define CONFIG_CMD_DEMO
-#define CONFIG_DM_DEMO
-#define CONFIG_DM_DEMO_SIMPLE
-#define CONFIG_DM_DEMO_SHAPE
-#define CONFIG_DM_GPIO
-#define CONFIG_DM_TEST
-#define CONFIG_DM_SERIAL
-#define CONFIG_DM_CROS_EC
 
 #define CONFIG_SYS_STDIO_DEREGISTER
 
@@ -95,8 +87,6 @@ 
 #define CONFIG_CMD_SF_TEST
 #define CONFIG_CMD_SPI
 #define CONFIG_SPI_FLASH
-#define CONFIG_DM_SPI
-#define CONFIG_DM_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_EON
 #define CONFIG_SPI_FLASH_GIGADEVICE
@@ -107,7 +97,6 @@ 
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_WINBOND
 
-#define CONFIG_DM_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C_SANDBOX
 #define CONFIG_I2C_EDID