[U-Boot] [WORKING PATCH 1/2] sandbox: Use defconfig to enable features

Joe Hershberger
2015-05-06T17:54:03Z

Stop using the sandbox arch Kconfig to override defaults for config
options. This is a bit of abuse and may be causing build problems.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
The errors you are seeing are the result of "CONFIG_UNIT_TEST" not being
defined. That should not be at all related to that test/dm/eth.c patch.
This is changing the way that CONFIG_UNIT_TEST is enabled to be more
typical in case there is some bad behavior with all this override of
defaults. I have seen some non-ideal behavior, so I want to move away
from using it.
Please apply this on top of u-boot-dm/env-working and try it.

arch/sandbox/Kconfig | 18 ------------------
configs/sandbox_defconfig | 5 +++++
2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 4647d11..f078c9e 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -10,12 +10,6 @@ config SYS_BOARD
config SYS_CONFIG_NAME
default "sandbox"

-config UNIT_TEST
- default y
-
-config UT_DM
- default y
-
config PCI
bool "PCI support"
help
@@ -23,16 +17,4 @@ config PCI
used on some devices to allow the CPU to communicate with its
peripherals.

-config NET
- default y
-
-config NETDEVICES
- default y
-
-config DM_ETH
- default y
-
-config ETH_SANDBOX_RAW
- default y
-
endmenu
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 3ac0a5a..65002f7 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -10,12 +10,15 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_CMD_SOUND=y
CONFIG_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y
+CONFIG_NET=y
CONFIG_DM_PCI=y
CONFIG_PCI_SANDBOX=y
CONFIG_SPI_FLASH_SANDBOX=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SANDBOX=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
CONFIG_CROS_EC_KEYB=y
CONFIG_TPM_TIS_SANDBOX=y
CONFIG_SYS_I2C_SANDBOX=y
@@ -27,4 +30,6 @@ CONFIG_USB=y
CONFIG_USB_EMUL=y
CONFIG_USB_STORAGE=y
CONFIG_DM_RTC=y
+CONFIG_UNIT_TEST=y
+CONFIG_UT_DM=y
CONFIG_UT_ENV=y
--
1.7.11.5