diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-10 08:05:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-10 08:05:57 -0500 |
| commit | 084edbb6892b3712e2f9fd3abd5871652492fc42 (patch) | |
| tree | 1f26fd21cc86177d6ba76cb88ca60c1772d8c5f9 /include | |
| parent | ec75fab302a8b2ddf291cc1b7219b0333cea1a4d (diff) | |
| parent | 0a05bf42b462c0fd0299c768560c5ad532cdf619 (diff) | |
| download | u-boot-084edbb6892b3712e2f9fd3abd5871652492fc42.tar.gz | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-37xx.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index af16b9454a..9f2db099cd 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -44,9 +44,6 @@ /* * Other required minimal configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE -#define CONFIG_CMDLINE_EDITING #define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ #define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */ @@ -107,4 +104,24 @@ #define CONFIG_SUPPORT_VFAT +#include <config_distro_defaults.h> + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(SCSI, scsi, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "scriptaddr=0x4d00000\0" \ + "pxefile_addr_r=0x4e00000\0" \ + "fdt_addr_r=0x4f00000\0" \ + "kernel_addr_r=0x5000000\0" \ + "ramdisk_addr_r=0x8000000\0" \ + BOOTENV + #endif /* _CONFIG_MVEBU_ARMADA_37XX_H */ |