[PATCH 1/2] xilinx: Allow alternative boot strategies in zynq-common.h

[Mike Looijmans]

Allow config headers that include zynq-common.h to provide their own
(distro) boot strategies. This is implemented by skipping the section
when BOOT_ENV has already been defined.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
---

 include/configs/zynq-common.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 37c77aa1611..ad872c9d922 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -48,6 +48,9 @@
 #define BOOTENV
 #else
 
+/* Only use this section if no BOOTENV has been configured yet */
+#ifndef BOOTENV
+
 #ifdef CONFIG_CMD_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else
@@ -167,6 +170,9 @@
 	BOOT_TARGET_DEVICES_DHCP(func)
 
 #include <config_distro_bootcmd.h>
+
+#endif /* BOOTENV */
+
 #endif /* CONFIG_XPL_BUILD */
 
 /* Default environment */
-- 
2.43.0


Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans at topic.nl
W: www.topic.nl

Please consider the environment before printing this e-mail