stm32mp1: configs: Make all boot devices in distro boot conditional
PATCH v2 1/1 stm32mp1: configs: Make all boot devices in distro boot conditional
Not all systems have all the boot devices enabled, e.g. not all systems have MTD devices and thus do not enable UBI. Make all the boot devices in the distro bootcmd conditional to avoid failures.
Signed-off-by Marek Vasut <[email protected]>
Cc Patrick Delaunay <[email protected]>
Cc Patrice Chotard <[email protected]>
---
V2: Drop the _DEVICE from BOOT_TARGET_DEVICE_*
--- include/configs/stm32mp1.h | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
include/configs/stm32mp1.h +28 -6
@@ -98,12 +98,34 @@#if !defined(CONFIG_SPL_BUILD ) -#define BOOT_TARGET_DEVICES (func) \ - func(MMC, mmc, 1) \ - func(UBIFS, ubifs, 0) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 2) \ - func(PXE, pxe, na) +#ifdef CONFIG_CMD_MMC +#define BOOT_TARGET_MMC0 (func) func(MMC, mmc, 0) +#define BOOT_TARGET_MMC1 (func) func(MMC, mmc, 1) +#define BOOT_TARGET_MMC2 (func) func(MMC, mmc, 2) +#else +#define BOOT_TARGET_MMC0 (func) +#define BOOT_TARGET_MMC1 (func) +#define BOOT_TARGET_MMC2 (func) +#endif + +#ifdef CONFIG_NET +#define BOOT_TARGET_PXE (func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_PXE (func) +#endif + +#ifdef CONFIG_CMD_UBIFS +#define BOOT_TARGET_UBIFS (func) func(UBIFS, ubifs, 0) +#else +#define BOOT_TARGET_UBIFS (func) +#endif + +#define BOOT_TARGETS (func) \ + BOOT_TARGET_MMC1(func) \ + BOOT_TARGET_UBIFS(func) \ + BOOT_TARGET_MMC0(func) \ + BOOT_TARGET_MMC2(func) \ + BOOT_TARGET_PXE(func)/* * bootcmd for stm32mp1:
Signature · 1 line
2.24.1