sandbox: Cleanup order and extra defines in defconfig

The defconfigs should not be edited directly. They should be generated
by editing the .config (through menuconfig or whatever) and then run
make savedefconfig to have the Kconfig system generate a clean defconfig

I did this for sandbox here with no actual changes.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index f8dac33a4a78f45a370df29d4e51e0be3fde6988..b333b6175af1f05a5c1fc1323fa842745a96ab57 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -8,6 +8,8 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_SOUND=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_SOUND=y

+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y

 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DM_PCI=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DM_PCI=y


@@ -21,17 +23,15 @@ CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SANDBOX_GPIO=y
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SANDBOX_GPIO=y

+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_SANDBOX=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_SANDBOX=y

 CONFIG_SOUND=y
 CONFIG_SOUND_SANDBOX=y
 CONFIG_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_RTC=y
 CONFIG_SOUND=y
 CONFIG_SOUND_SANDBOX=y
 CONFIG_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_RTC=y

-CONFIG_CMD_UT_TIME=y

 CONFIG_ERRNO_STR=y
 CONFIG_ERRNO_STR=y

-CONFIG_DM_PMIC=y
-CONFIG_DM_PMIC_SANDBOX=y
-CONFIG_CMD_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_SANDBOX=y
-CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_UT_TIME=y