[PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals
@ 2022-05-23  9:14 Pali Rohár
  2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Pali Rohár @ 2022-05-23  9:14 UTC (permalink / raw)
  To: Stefan Roese, Robert Marko; +Cc: u-boot

This allows to compile U-Boot without some boot option for some A3720 board
which does not have that peripheral.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 include/configs/mvebu_armada-37xx.h | 42 ++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index a39db075eae9..2ed6125f5c43 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -40,13 +40,43 @@
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA
 
+#ifdef CONFIG_MMC
+#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i)
+#else
+#define BOOT_TARGET_DEVICES_MMC(func, i)
+#endif
+
+#ifdef CONFIG_USB_STORAGE
+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
+#else
+#define BOOT_TARGET_DEVICES_USB(func)
+#endif
+
+#ifdef CONFIG_SCSI
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
+#else
+#define BOOT_TARGET_DEVICES_SCSI(func)
+#endif
+
+#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
+#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
+#else
+#define BOOT_TARGET_DEVICES_PXE(func)
+#endif
+
+#ifdef CONFIG_CMD_DHCP
+#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)
+#else
+#define BOOT_TARGET_DEVICES_DHCP(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func) \
-	func(MMC, mmc, 1) \
-	func(MMC, mmc, 0) \
-	func(USB, usb, 0) \
-	func(SCSI, scsi, 0) \
-	func(PXE, pxe, na) \
-	func(DHCP, dhcp, na)
+	BOOT_TARGET_DEVICES_MMC(func, 1) \
+	BOOT_TARGET_DEVICES_MMC(func, 0) \
+	BOOT_TARGET_DEVICES_USB(func) \
+	BOOT_TARGET_DEVICES_SCSI(func) \
+	BOOT_TARGET_DEVICES_PXE(func) \
+	BOOT_TARGET_DEVICES_DHCP(func)
 
 #include <config_distro_bootcmd.h>
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list
  2022-05-23  9:14 [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Pali Rohár
@ 2022-05-23  9:14 ` Pali Rohár
  2022-05-30  6:14   ` Stefan Roese
  2022-07-21 12:24   ` Stefan Roese
  2022-05-30  6:14 ` [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Stefan Roese
  2022-07-21 12:24 ` Stefan Roese
  2 siblings, 2 replies; 6+ messages in thread
From: Pali Rohár @ 2022-05-23  9:14 UTC (permalink / raw)
  To: Stefan Roese, Robert Marko; +Cc: u-boot

Enable NVMe booting on boards which have enabled NVMe drivers.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 include/configs/mvebu_armada-37xx.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 2ed6125f5c43..d656bbc463b2 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -58,6 +58,12 @@
 #define BOOT_TARGET_DEVICES_SCSI(func)
 #endif
 
+#ifdef CONFIG_NVME
+#define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0)
+#else
+#define BOOT_TARGET_DEVICES_NVME(func)
+#endif
+
 #if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
 #define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
 #else
@@ -74,6 +80,7 @@
 	BOOT_TARGET_DEVICES_MMC(func, 1) \
 	BOOT_TARGET_DEVICES_MMC(func, 0) \
 	BOOT_TARGET_DEVICES_USB(func) \
+	BOOT_TARGET_DEVICES_NVME(func) \
 	BOOT_TARGET_DEVICES_SCSI(func) \
 	BOOT_TARGET_DEVICES_PXE(func) \
 	BOOT_TARGET_DEVICES_DHCP(func)
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list
  2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
@ 2022-05-30  6:14   ` Stefan Roese
  2022-07-21 12:24   ` Stefan Roese
  1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-05-30  6:14 UTC (permalink / raw)
  To: Pali Rohár, Robert Marko; +Cc: u-boot

On 23.05.22 11:14, Pali Rohár wrote:
> Enable NVMe booting on boards which have enabled NVMe drivers.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   include/configs/mvebu_armada-37xx.h | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 2ed6125f5c43..d656bbc463b2 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -58,6 +58,12 @@
>   #define BOOT_TARGET_DEVICES_SCSI(func)
>   #endif
>   
> +#ifdef CONFIG_NVME
> +#define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_NVME(func)
> +#endif
> +
>   #if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
>   #define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
>   #else
> @@ -74,6 +80,7 @@
>   	BOOT_TARGET_DEVICES_MMC(func, 1) \
>   	BOOT_TARGET_DEVICES_MMC(func, 0) \
>   	BOOT_TARGET_DEVICES_USB(func) \
> +	BOOT_TARGET_DEVICES_NVME(func) \
>   	BOOT_TARGET_DEVICES_SCSI(func) \
>   	BOOT_TARGET_DEVICES_PXE(func) \
>   	BOOT_TARGET_DEVICES_DHCP(func)

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list
  2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
  2022-05-30  6:14   ` Stefan Roese
@ 2022-07-21 12:24   ` Stefan Roese
  1 sibling, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-07-21 12:24 UTC (permalink / raw)
  To: Pali Rohár, Robert Marko; +Cc: u-boot

On 23.05.22 11:14, Pali Rohár wrote:
> Enable NVMe booting on boards which have enabled NVMe drivers.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   include/configs/mvebu_armada-37xx.h | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 2ed6125f5c43..d656bbc463b2 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -58,6 +58,12 @@
>   #define BOOT_TARGET_DEVICES_SCSI(func)
>   #endif
>   
> +#ifdef CONFIG_NVME
> +#define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_NVME(func)
> +#endif
> +
>   #if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
>   #define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
>   #else
> @@ -74,6 +80,7 @@
>   	BOOT_TARGET_DEVICES_MMC(func, 1) \
>   	BOOT_TARGET_DEVICES_MMC(func, 0) \
>   	BOOT_TARGET_DEVICES_USB(func) \
> +	BOOT_TARGET_DEVICES_NVME(func) \
>   	BOOT_TARGET_DEVICES_SCSI(func) \
>   	BOOT_TARGET_DEVICES_PXE(func) \
>   	BOOT_TARGET_DEVICES_DHCP(func)

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals
  2022-05-23  9:14 [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Pali Rohár
  2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
@ 2022-05-30  6:14 ` Stefan Roese
  2022-07-21 12:24 ` Stefan Roese
  2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-05-30  6:14 UTC (permalink / raw)
  To: Pali Rohár, Robert Marko; +Cc: u-boot

On 23.05.22 11:14, Pali Rohár wrote:
> This allows to compile U-Boot without some boot option for some A3720 board
> which does not have that peripheral.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   include/configs/mvebu_armada-37xx.h | 42 ++++++++++++++++++++++++-----
>   1 file changed, 36 insertions(+), 6 deletions(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index a39db075eae9..2ed6125f5c43 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -40,13 +40,43 @@
>   #define CONFIG_LBA48
>   #define CONFIG_SYS_64BIT_LBA
>   
> +#ifdef CONFIG_MMC
> +#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i)
> +#else
> +#define BOOT_TARGET_DEVICES_MMC(func, i)
> +#endif
> +
> +#ifdef CONFIG_USB_STORAGE
> +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_USB(func)
> +#endif
> +
> +#ifdef CONFIG_SCSI
> +#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_SCSI(func)
> +#endif
> +
> +#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
> +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
> +#else
> +#define BOOT_TARGET_DEVICES_PXE(func)
> +#endif
> +
> +#ifdef CONFIG_CMD_DHCP
> +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)
> +#else
> +#define BOOT_TARGET_DEVICES_DHCP(func)
> +#endif
> +
>   #define BOOT_TARGET_DEVICES(func) \
> -	func(MMC, mmc, 1) \
> -	func(MMC, mmc, 0) \
> -	func(USB, usb, 0) \
> -	func(SCSI, scsi, 0) \
> -	func(PXE, pxe, na) \
> -	func(DHCP, dhcp, na)
> +	BOOT_TARGET_DEVICES_MMC(func, 1) \
> +	BOOT_TARGET_DEVICES_MMC(func, 0) \
> +	BOOT_TARGET_DEVICES_USB(func) \
> +	BOOT_TARGET_DEVICES_SCSI(func) \
> +	BOOT_TARGET_DEVICES_PXE(func) \
> +	BOOT_TARGET_DEVICES_DHCP(func)
>   
>   #include <config_distro_bootcmd.h>
>   

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals
  2022-05-23  9:14 [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Pali Rohár
  2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
  2022-05-30  6:14 ` [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Stefan Roese
@ 2022-07-21 12:24 ` Stefan Roese
  2 siblings, 0 replies; 6+ messages in thread
From: Stefan Roese @ 2022-07-21 12:24 UTC (permalink / raw)
  To: Pali Rohár, Robert Marko; +Cc: u-boot

On 23.05.22 11:14, Pali Rohár wrote:
> This allows to compile U-Boot without some boot option for some A3720 board
> which does not have that peripheral.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   include/configs/mvebu_armada-37xx.h | 42 ++++++++++++++++++++++++-----
>   1 file changed, 36 insertions(+), 6 deletions(-)
> 
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index a39db075eae9..2ed6125f5c43 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -40,13 +40,43 @@
>   #define CONFIG_LBA48
>   #define CONFIG_SYS_64BIT_LBA
>   
> +#ifdef CONFIG_MMC
> +#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i)
> +#else
> +#define BOOT_TARGET_DEVICES_MMC(func, i)
> +#endif
> +
> +#ifdef CONFIG_USB_STORAGE
> +#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_USB(func)
> +#endif
> +
> +#ifdef CONFIG_SCSI
> +#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
> +#else
> +#define BOOT_TARGET_DEVICES_SCSI(func)
> +#endif
> +
> +#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
> +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
> +#else
> +#define BOOT_TARGET_DEVICES_PXE(func)
> +#endif
> +
> +#ifdef CONFIG_CMD_DHCP
> +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)
> +#else
> +#define BOOT_TARGET_DEVICES_DHCP(func)
> +#endif
> +
>   #define BOOT_TARGET_DEVICES(func) \
> -	func(MMC, mmc, 1) \
> -	func(MMC, mmc, 0) \
> -	func(USB, usb, 0) \
> -	func(SCSI, scsi, 0) \
> -	func(PXE, pxe, na) \
> -	func(DHCP, dhcp, na)
> +	BOOT_TARGET_DEVICES_MMC(func, 1) \
> +	BOOT_TARGET_DEVICES_MMC(func, 0) \
> +	BOOT_TARGET_DEVICES_USB(func) \
> +	BOOT_TARGET_DEVICES_SCSI(func) \
> +	BOOT_TARGET_DEVICES_PXE(func) \
> +	BOOT_TARGET_DEVICES_DHCP(func)
>   
>   #include <config_distro_bootcmd.h>
>   

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-07-21 12:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-23  9:14 [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Pali Rohár
2022-05-23  9:14 ` [PATCH 2/2] arm: mvebu: a3720: Add NVMe to BOOT_TARGET_DEVICES list Pali Rohár
2022-05-30  6:14   ` Stefan Roese
2022-07-21 12:24   ` Stefan Roese
2022-05-30  6:14 ` [PATCH 1/2] arm: mvebu: a3720: Set BOOT_TARGET_DEVICES list to enabled peripherals Stefan Roese
2022-07-21 12:24 ` Stefan Roese

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox