mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-26 23:41:50 +00:00
mvebu: armada-8k: respect CONFIG_DISTRO_DEFAULTS
Currently, Armada 8k config header is setting boot devices and including <config_distro_bootcmd.h> regardless of the CONFIG_DISTRO_DEFAULTS being enabled or not, thus populating the environment for distro boot even on devices that have no need for it. So, lets simply respect the value of CONFIG_DISTRO_DEFAULTS. Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
aec83261b9
commit
711443eafe
1 changed files with 4 additions and 1 deletions
|
@ -30,7 +30,7 @@
|
||||||
/*
|
/*
|
||||||
* PCI configuration
|
* PCI configuration
|
||||||
*/
|
*/
|
||||||
|
#ifdef CONFIG_DISTRO_DEFAULTS
|
||||||
#define BOOT_TARGET_DEVICES(func) \
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
func(MMC, mmc, 1) \
|
func(MMC, mmc, 1) \
|
||||||
func(MMC, mmc, 0) \
|
func(MMC, mmc, 0) \
|
||||||
|
@ -40,6 +40,9 @@
|
||||||
func(DHCP, dhcp, na)
|
func(DHCP, dhcp, na)
|
||||||
|
|
||||||
#include <config_distro_bootcmd.h>
|
#include <config_distro_bootcmd.h>
|
||||||
|
#else
|
||||||
|
#define BOOTENV
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CFG_EXTRA_ENV_SETTINGS \
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
"scriptaddr=0x6d00000\0" \
|
"scriptaddr=0x6d00000\0" \
|
||||||
|
|
Loading…
Add table
Reference in a new issue