diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-01 20:47:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-02 12:53:41 (GMT) |
| commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
| tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /configs/odroid_defconfig | |
| parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
| parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
| download | u-boot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/odroid_defconfig')
| -rw-r--r-- | configs/odroid_defconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index a659bfc..5efcdf5 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -1,15 +1,17 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_ODROID=y -CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y -CONFIG_ERRNO_STR=y CONFIG_DM_PMIC=y -CONFIG_CMD_PMIC=y CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_REGULATOR=y -CONFIG_CMD_REGULATOR=y CONFIG_DM_REGULATOR_MAX77686=y +CONFIG_ERRNO_STR=y |