diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-31 10:26:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-31 10:26:02 -0400 |
| commit | 653bb0d92eefb7255c88a8a251a3dbabec9345b6 (patch) | |
| tree | b64953fbb087a9e2ba77291d6f47e3f421896c6b /configs | |
| parent | 14070e69ad6d01abf65c06150dc9302bca1b7973 (diff) | |
| parent | e084fd922f7483d591c623823452fff7879c9d71 (diff) | |
| download | u-boot-653bb0d92eefb7255c88a8a251a3dbabec9345b6.tar.gz | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/clearfog_defconfig | 1 | ||||
| -rw-r--r-- | configs/x600_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 0fde640deb..75ea200b27 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CLEARFOG=y CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" +CONFIG_HUSH_PARSER=y CONFIG_SPL=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/x600_defconfig b/configs/x600_defconfig index ace620ba3a..14977dca8a 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -22,3 +22,4 @@ CONFIG_NETDEVICES=y CONFIG_ETH_DESIGNWARE=y CONFIG_USE_TINY_PRINTF=y CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set |