summaryrefslogtreecommitdiff
path: root/configs/peach-pit_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-23 20:41:04 -0400
committerTom Rini <trini@konsulko.com>2015-08-23 20:41:04 -0400
commit14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (patch)
treeecb16f3b3434a5ac501fa5c9d7fbea00c87f225c /configs/peach-pit_defconfig
parent7a53b9544e388ac80bff2a3912865df029de27d0 (diff)
parenta77fda1f7df4739d044ca9fcf413b1c93cef111e (diff)
downloadu-boot-imx-14e7a30f2e8963fc5b91ba68e53bb2de708aee65.zip
u-boot-imx-14e7a30f2e8963fc5b91ba68e53bb2de708aee65.tar.gz
u-boot-imx-14e7a30f2e8963fc5b91ba68e53bb2de708aee65.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'configs/peach-pit_defconfig')
-rw-r--r--configs/peach-pit_defconfig28
1 files changed, 14 insertions, 14 deletions
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index e9fc6ae..6a08296 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -5,30 +5,30 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
CONFIG_SPI_FLASH=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_CROS_EC_KEYB=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_I2C_MUX=y
+CONFIG_DM_I2C=y
+CONFIG_DM_I2C_COMPAT=y
CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_TPS65090=y
+CONFIG_DM_REGULATOR=y
+CONFIG_REGULATOR_TPS65090=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
CONFIG_SOUND=y
CONFIG_I2S=y
CONFIG_I2S_SAMSUNG=y
CONFIG_SOUND_MAX98095=y
CONFIG_SOUND_WM8994=y
-CONFIG_DM_I2C=y
-CONFIG_DM_PMIC=y
-CONFIG_DM_REGULATOR=y
-CONFIG_PMIC_TPS65090=y
-CONFIG_REGULATOR_TPS65090=y
-CONFIG_DM_I2C_COMPAT=y
-CONFIG_I2C_ARB_GPIO_CHALLENGE=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_REGULATOR=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
CONFIG_ERRNO_STR=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
CONFIG_SYS_PROMPT="Peach-Pit # "