Skip to contentSkip to conversation

mvebu: armada-8k: respect CONFIG_DISTRO_DEFAULTS

PATCH In review Robert Marko 2 participants 2 messages Jun 21, 2024 – Jul 8, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/configs/mvebu_armada-8k.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/mvebu_armada-8k.h +4 -1
index 239a09763a..6fedbe9ee3 100644
@@ -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"	\
Signature · 1 line
2.45.2
#1 lore raw
Quoted 8 lines · Robert Marko

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.

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 18 lines
---
  include/configs/mvebu_armada-8k.h | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/mvebu_armada-8k.h +1 -1
index 239a09763a..6fedbe9ee3 100644
@@ -30,7 +30,7 @@
  /*
   * PCI configuration
   */
-
+#ifdef CONFIG_DISTRO_DEFAULTS
  #define BOOT_TARGET_DEVICES(func) \
  	func(MMC, mmc, 1) \
  	func(MMC, mmc, 0) \

include/configs/mvebu_armada-8k.h line 48

Quoted 9 lines
include/configs/mvebu_armada-8k.h +3 -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

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]