diff options
| author | Tom Rini | 2024-07-08 08:47:00 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-07-08 08:47:00 -0600 |
| commit | 036e33cffb4a2c9aa68c56c4a92e74a7201ca9b7 (patch) | |
| tree | f9cb80f96a8474c8b032611595cb9855462babec /include | |
| parent | 4480b53b194e388b37311eb63e1d7d73d3672b32 (diff) | |
| parent | 711443eafe0d8064744f6ee69cef08b032346c74 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Add mvebu_espressobin_ultra-88f3720_defconfig (Benjamin)
- Update DTS for Thecus N2350 board (Tony)
- Add "old" Marvell DDR3 training for Armada 38x and Turris Omnia
(Marek)
- Misc turris_omnia changes (Marek)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-8k.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 239a09763ae..6fedbe9ee38 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -30,7 +30,7 @@ /* * PCI configuration */ - +#ifdef CONFIG_DISTRO_DEFAULTS #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ @@ -40,6 +40,9 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#else +#define BOOTENV +#endif #define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ |