summaryrefslogtreecommitdiff
path: root/configs/sandbox_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-13 09:45:14 -0400
committerTom Rini <trini@konsulko.com>2016-06-17 09:34:49 -0400
commit7802ce910ba17a962d90b60b5e998e40d5a08067 (patch)
tree5cca3c51f6420d202d36d363b28603b3a57af1d3 /configs/sandbox_defconfig
parent5e4e87418e0f0e62854fe6c38736e2ee771ec3a7 (diff)
downloadu-boot-7802ce910ba17a962d90b60b5e998e40d5a08067.tar.gz
configs: Re-sync BOOTDELAY changes
With updated moveconfig.py and an better default, re-generate the migration of BOOTDELAY to the defconfig. Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/sandbox_defconfig')
-rw-r--r--configs/sandbox_defconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 71f713083a..4eb3c224fd 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,5 +1,4 @@
CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_BLK=y
CONFIG_MMC=y
CONFIG_PCI=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
@@ -71,6 +70,7 @@ CONFIG_DEVRES=y
CONFIG_DEBUG_DEVRES=y
CONFIG_ADC=y
CONFIG_ADC_SANDBOX=y
+CONFIG_BLK=y
CONFIG_CLK=y
CONFIG_CPU=y
CONFIG_DM_DEMO=y
@@ -89,9 +89,6 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
CONFIG_CROS_EC_KEYB=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
-CONFIG_DM_MAILBOX=y
-CONFIG_SANDBOX_MBOX=y
-CONFIG_MISC=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
@@ -173,3 +170,6 @@ CONFIG_UNIT_TEST=y
CONFIG_UT_TIME=y
CONFIG_UT_DM=y
CONFIG_UT_ENV=y
+CONFIG_MISC=y
+CONFIG_DM_MAILBOX=y
+CONFIG_SANDBOX_MBOX=y