diff options
| author | Robert Marko <robimarko@gmail.com> | 2024-06-21 11:46:02 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2024-07-08 08:20:58 +0200 |
| commit | 711443eafe0d8064744f6ee69cef08b032346c74 (patch) | |
| tree | 6a9b125441ccfff24415d275b78c8a09009464b9 | |
| parent | aec83261b98eec3a2ca2e9a5a2debea31fcd9d65 (diff) | |
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>
| -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" \ |