diff options
| author | Mike Looijmans <mike.looijmans@topic.nl> | 2025-03-12 16:36:31 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@amd.com> | 2025-04-16 13:42:06 +0200 |
| commit | 43dfb55e2228aafe55db121fd24b4b1e46e56d03 (patch) | |
| tree | e46113046bfdb0af9fca5332f79087c819402963 | |
| parent | 3243f71b64db89b8a6c045d41379b65aceabdd3c (diff) | |
xilinx: Allow alternative boot strategies in zynq-common.h
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@topic.nl>
Link: https://lore.kernel.org/r/20250312153741.24007-1-mike.looijmans@topic.nl
Signed-off-by: Michal Simek <michal.simek@amd.com>
| -rw-r--r-- | include/configs/zynq-common.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 93ae5891a07..94273d0deb9 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -46,7 +46,10 @@ #ifdef CONFIG_XPL_BUILD #define BOOTENV -#else +#endif + +/* 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) @@ -167,7 +170,8 @@ BOOT_TARGET_DEVICES_DHCP(func) #include <config_distro_bootcmd.h> -#endif /* CONFIG_XPL_BUILD */ + +#endif /* BOOTENV */ /* Default environment */ #ifndef CFG_EXTRA_ENV_SETTINGS |