| Message ID | 20240621094613.1438806-1-robimarko@gmail.com |
|---|---|
| State | Accepted |
| Commit | 711443eafe0d8064744f6ee69cef08b032346c74 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | mvebu: armada-8k: respect CONFIG_DISTRO_DEFAULTS | expand |
On 6/21/24 11:46, Robert Marko wrote: > 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> Applied to u-boot-marvell/master Thanks, Stefan > --- > include/configs/mvebu_armada-8k.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h > index 239a09763a..6fedbe9ee3 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" \ Viele Grüße, Stefan Roese
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 239a09763a..6fedbe9ee3 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" \
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> --- include/configs/mvebu_armada-8k.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)