diff options
author | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
tree | 61b31e61173154abd38aaa6584e84ea77314b861 /configs/origen_defconfig | |
parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
download | talos-obmc-uboot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.gz talos-obmc-uboot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.zip |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'configs/origen_defconfig')
-rw-r--r-- | configs/origen_defconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 657ef7e7da..696197827f 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -1,8 +1,15 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_ORIGEN=y -CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen" CONFIG_SPL=y -CONFIG_CMD_SETEXPR=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_NFS is not set +# CONFIG_CMD_MISC is not set CONFIG_OF_CONTROL=y +CONFIG_SPL_DISABLE_OF_CONTROL=y +CONFIG_USB=y +CONFIG_DM_USB=y |