summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-05 07:46:45 -0500
committerTom Rini <trini@konsulko.com>2015-11-05 07:46:45 -0500
commit60b25259a5540686add02cf6c94cd7494a3e2d23 (patch)
treeabccf513238a9bab314b4672858512801da85580 /configs
parent1674942ad777bc1ae26fe93684836dcd8820f47f (diff)
parent58cb44cf6623faeebd9b04ac44cf11d2eb39ea36 (diff)
downloadblackbird-obmc-uboot-60b25259a5540686add02cf6c94cd7494a3e2d23.tar.gz
blackbird-obmc-uboot-60b25259a5540686add02cf6c94cd7494a3e2d23.zip
Merge git://git.denx.de/u-boot-samsung
Diffstat (limited to 'configs')
-rw-r--r--configs/odroid-xu3_defconfig5
-rw-r--r--configs/sandbox_defconfig2
2 files changed, 7 insertions, 0 deletions
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 479af9e71a..4ab91fa828 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -9,7 +9,12 @@ CONFIG_SYS_PROMPT="ODROID-XU3 # "
# CONFIG_CMD_SETEXPR is not set
CONFIG_DM_I2C_COMPAT=y
CONFIG_DM_PMIC=y
+CONFIG_CMD_PMIC=y
+CONFIG_ERRNO_STR=y
CONFIG_DM_REGULATOR=y
+CONFIG_PMIC_S2MPS11=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_VIDEO_BRIDGE=y
+CONFIG_ADC=y
+CONFIG_ADC_EXYNOS=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 67ae99b638..94c8e685f0 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -65,3 +65,5 @@ CONFIG_UT_DM=y
CONFIG_UT_ENV=y
CONFIG_REMOTEPROC_SANDBOX=y
CONFIG_CMD_REMOTEPROC=y
+CONFIG_ADC=y
+CONFIG_ADC_SANDBOX=y
OpenPOWER on IntegriCloud