diff mbox series

[V2] stm32mp1: configs: Make all boot devices in distro boot conditional

Message ID 20200110002355.83669-1-marex@denx.de
State Superseded
Headers show
Series [V2] stm32mp1: configs: Make all boot devices in distro boot conditional | expand

Commit Message

Marek Vasut Jan. 10, 2020, 12:23 a.m. UTC 
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 <marex at denx.de>
Cc: Patrick Delaunay <patrick.delaunay at st.com>
Cc: Patrice Chotard <patrice.chotard at st.com>
---
V2: Drop the _DEVICE from BOOT_TARGET_DEVICE_*
---
 include/configs/stm32mp1.h | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index d42a7860be..44dc208bb0 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -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: