* [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
@ 2020-01-10 0:26 Marek Vasut
2020-01-10 8:39 ` Patrice CHOTARD
2020-01-13 10:44 ` Patrick DELAUNAY
0 siblings, 2 replies; 5+ messages in thread
From: Marek Vasut @ 2020-01-10 0:26 UTC (permalink / raw)
To: u-boot
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@denx.de>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
---
V2: Drop the _DEVICE from BOOT_TARGET_DEVICE_*
V3: Fix BOOT_TARGET_DEVICES, which was missing the _DEVICE in V2
---
include/configs/stm32mp1.h | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index d42a7860be..655833428e 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_TARGET_DEVICES(func) \
+ BOOT_TARGET_MMC1(func) \
+ BOOT_TARGET_UBIFS(func) \
+ BOOT_TARGET_MMC0(func) \
+ BOOT_TARGET_MMC2(func) \
+ BOOT_TARGET_PXE(func)
/*
* bootcmd for stm32mp1:
--
2.24.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
2020-01-10 0:26 [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional Marek Vasut
@ 2020-01-10 8:39 ` Patrice CHOTARD
2020-01-13 10:44 ` Patrick DELAUNAY
1 sibling, 0 replies; 5+ messages in thread
From: Patrice CHOTARD @ 2020-01-10 8:39 UTC (permalink / raw)
To: u-boot
Hi Marek
On 1/10/20 1:26 AM, Marek Vasut wrote:
> 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@denx.de>
> Cc: Patrick Delaunay <patrick.delaunay@st.com>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> ---
> V2: Drop the _DEVICE from BOOT_TARGET_DEVICE_*
> V3: Fix BOOT_TARGET_DEVICES, which was missing the _DEVICE in V2
> ---
> include/configs/stm32mp1.h | 34 ++++++++++++++++++++++++++++------
> 1 file changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
> index d42a7860be..655833428e 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_TARGET_DEVICES(func) \
> + BOOT_TARGET_MMC1(func) \
> + BOOT_TARGET_UBIFS(func) \
> + BOOT_TARGET_MMC0(func) \
> + BOOT_TARGET_MMC2(func) \
> + BOOT_TARGET_PXE(func)
>
> /*
> * bootcmd for stm32mp1:
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
2020-01-10 0:26 [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional Marek Vasut
2020-01-10 8:39 ` Patrice CHOTARD
@ 2020-01-13 10:44 ` Patrick DELAUNAY
2020-01-13 10:46 ` Marek Vasut
1 sibling, 1 reply; 5+ messages in thread
From: Patrick DELAUNAY @ 2020-01-13 10:44 UTC (permalink / raw)
To: u-boot
Hi Marek,
> From: Marek Vasut <marex@denx.de>
> Sent: vendredi 10 janvier 2020 01:27
>
> 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.
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Patrick Delaunay <patrick.delaunay@st.com>
> Cc: Patrice Chotard <patrice.chotard@st.com>
> ---
Regards
Patrick
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
2020-01-13 10:44 ` Patrick DELAUNAY
@ 2020-01-13 10:46 ` Marek Vasut
2020-01-17 12:42 ` Patrick DELAUNAY
0 siblings, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2020-01-13 10:46 UTC (permalink / raw)
To: u-boot
On 1/13/20 11:44 AM, Patrick DELAUNAY wrote:
> Hi Marek,
Hi,
>> From: Marek Vasut <marex@denx.de>
>> Sent: vendredi 10 janvier 2020 01:27
>>
>> 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.
>
> Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
Are you planning to pick those up ?
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
2020-01-13 10:46 ` Marek Vasut
@ 2020-01-17 12:42 ` Patrick DELAUNAY
0 siblings, 0 replies; 5+ messages in thread
From: Patrick DELAUNAY @ 2020-01-17 12:42 UTC (permalink / raw)
To: u-boot
Hi
> From: Marek Vasut <marex@denx.de>
> Sent: lundi 13 janvier 2020 11:46
> To: Patrick DELAUNAY <patrick.delaunay@st.com>; u-boot at lists.denx.de
> Cc: Patrice CHOTARD <patrice.chotard@st.com>
> Subject: Re: [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot
> conditional
> Importance: High
>
> On 1/13/20 11:44 AM, Patrick DELAUNAY wrote:
> > Hi Marek,
>
> Hi,
>
> >> From: Marek Vasut <marex@denx.de>
> >> Sent: vendredi 10 janvier 2020 01:27
> >>
> >> 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.
> >
> > Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
>
> Are you planning to pick those up ?
Applied to u-boot-stm32/master, thanks!
Regards
Patrick
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-17 12:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 0:26 [PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional Marek Vasut
2020-01-10 8:39 ` Patrice CHOTARD
2020-01-13 10:44 ` Patrick DELAUNAY
2020-01-13 10:46 ` Marek Vasut
2020-01-17 12:42 ` Patrick DELAUNAY
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.