summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-20 05:14:01 -0400
committerTom Rini <trini@konsulko.com>2016-06-20 05:14:01 -0400
commit09849f4a7779a247be8af5cfae44f7aad30e1222 (patch)
tree50891a9305714eff354702443555f52f1a65463c /configs
parent7c8ef0feb97586d35b0296b48903daef8c06ab21 (diff)
parent135aa95002646c46e89de93fa36adad1b010548f (diff)
downloadtalos-obmc-uboot-09849f4a7779a247be8af5cfae44f7aad30e1222.tar.gz
talos-obmc-uboot-09849f4a7779a247be8af5cfae44f7aad30e1222.zip
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'configs')
-rw-r--r--configs/sandbox_defconfig10
1 files changed, 6 insertions, 4 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 4eb3c224fd..94253a65e4 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,4 +1,5 @@
CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_BLK=y
CONFIG_MMC=y
CONFIG_PCI=y
CONFIG_DEFAULT_DEVICE_TREE="sandbox"
@@ -70,7 +71,6 @@ 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,6 +89,9 @@ 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
@@ -140,6 +143,8 @@ CONFIG_DM_REGULATOR_SANDBOX=y
CONFIG_REGULATOR_TPS65090=y
CONFIG_RAM=y
CONFIG_REMOTEPROC_SANDBOX=y
+CONFIG_DM_RESET=y
+CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_SANDBOX_SERIAL=y
CONFIG_SOUND=y
@@ -170,6 +175,3 @@ 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
OpenPOWER on IntegriCloud