[U-Boot] [PATCH 00/12] nxp: fix dhcp and efi boot support for various socs

[U-Boot] [PATCH 00/12] nxp: fix dhcp and efi boot support for various socs

[Mian Yousaf Kaukab]

This patch series fixes dhcp and efi boot support for
nxp ls1043a, ls1046a, ls1088a and ls208xa platforms.

Patches are independent and can be cherry-picked individually.

Thank you,

Best regards,
Yousaf

Mian Yousaf Kaukab (12):
  nxp: ls1088a: fix dppa exit when using efi boot
  nxp: ls1088a: fix fsl-mc search path
  Revert "ls1088a: remove dhcp function from u-boot env as boot source"
  nxp: ls1088a: use default scan_dev_for_boot
  Revert "ls2080ardb: remove dhcp function from env as boot source"
  nxp: ls2080a: use default scan_dev_for_boot
  nxp: ls1046a: enable EFI_LOADER_BOUNCE_BUFFER
  nxp: ls1046a: enable dhcp boot
  nxp: ls1046a: use default scan_dev_for_boot
  nxp: ls1043a: enable EFI_LOADER_BOUNCE_BUFFER
  nxp: ls1043a: enable dhcp boot
  nxp: ls1043a: use default scan_dev_for_boot

 board/freescale/ls1088a/ls1088a.c               | 12 +++++++-----
 configs/ls1043aqds_defconfig                    |  1 +
 configs/ls1043aqds_lpuart_defconfig             |  1 +
 configs/ls1043aqds_nand_defconfig               |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig           |  1 +
 configs/ls1043aqds_qspi_defconfig               |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig         |  1 +
 configs/ls1043aqds_sdcard_qspi_defconfig        |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig    |  1 +
 configs/ls1043aqds_tfa_defconfig                |  1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig        |  1 +
 configs/ls1043ardb_defconfig                    |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig   |  1 +
 configs/ls1043ardb_nand_defconfig               |  1 +
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig |  1 +
 configs/ls1043ardb_sdcard_defconfig             |  1 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig    |  1 +
 configs/ls1043ardb_tfa_defconfig                |  1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig        |  1 +
 configs/ls1046aqds_defconfig                    |  1 +
 configs/ls1046aqds_lpuart_defconfig             |  1 +
 configs/ls1046aqds_nand_defconfig               |  1 +
 configs/ls1046aqds_qspi_defconfig               |  1 +
 configs/ls1046aqds_sdcard_ifc_defconfig         |  1 +
 configs/ls1046aqds_sdcard_qspi_defconfig        |  1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig    |  1 +
 configs/ls1046aqds_tfa_defconfig                |  1 +
 configs/ls1046ardb_emmc_defconfig               |  1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig   |  1 +
 configs/ls1046ardb_qspi_defconfig               |  1 +
 configs/ls1046ardb_qspi_spl_defconfig           |  1 +
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig |  1 +
 configs/ls1046ardb_sdcard_defconfig             |  1 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig    |  1 +
 configs/ls1046ardb_tfa_defconfig                |  1 +
 include/configs/ls1043a_common.h                |  9 ++-------
 include/configs/ls1046a_common.h                | 10 ++--------
 include/configs/ls1088ardb.h                    | 15 ++-------------
 include/configs/ls2080ardb.h                    | 15 ++-------------
 39 files changed, 49 insertions(+), 46 deletions(-)

-- 
2.11.0

[U-Boot] [PATCH 01/12] nxp: ls1088a: fix dppa exit when using efi boot

[Mian Yousaf Kaukab]

Same issue for ls2080a was fixed by following patch:
b7b8410a8f ls2080: Exit dpaa only right before exiting U-Boot

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 board/freescale/ls1088a/ls1088a.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 953aab6e88..6a33958207 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -643,6 +643,11 @@ int arch_misc_init(void)
 #endif
 
 #ifdef CONFIG_FSL_MC_ENET
+void board_quiesce_devices(void)
+{
+       fsl_mc_ldpaa_exit(gd->bd);
+}
+
 void fdt_fixup_board_enet(void *fdt)
 {
 	int offset;
@@ -732,7 +737,7 @@ void fsl_fdt_fixup_flash(void *fdt)
 
 int ft_board_setup(void *blob, bd_t *bd)
 {
-	int err, i;
+	int i;
 	u64 base[CONFIG_NR_DRAM_BANKS];
 	u64 size[CONFIG_NR_DRAM_BANKS];
 
@@ -762,9 +767,6 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 #ifdef CONFIG_FSL_MC_ENET
 	fdt_fixup_board_enet(blob);
-	err = fsl_mc_ldpaa_exit(bd);
-	if (err)
-		return err;
 #endif
 	if (is_pb_board())
 		fixup_ls1088ardb_pb_banner(blob);
-- 
2.11.0

[U-Boot] [PATCH 02/12] nxp: ls1088a: fix fsl-mc search path

[Mian Yousaf Kaukab]

Path for fsl-mc node in kernel device-tree is /soc/fsl-mc whereas
in u-boot it is /fsl-mc.

Fix the incorrect search path to fix following error:
fdt_fixup_board_enet: ERROR: fsl-mc node not found in device tree (error -1)

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 board/freescale/ls1088a/ls1088a.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 6a33958207..c46febdc92 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -655,7 +655,7 @@ void fdt_fixup_board_enet(void *fdt)
 	offset = fdt_path_offset(fdt, "/fsl-mc");
 
 	if (offset < 0)
-		offset = fdt_path_offset(fdt, "/fsl,dprc@0");
+		offset = fdt_path_offset(fdt, "/soc/fsl-mc");
 
 	if (offset < 0) {
 		printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n",
-- 
2.11.0

[U-Boot] [PATCH 03/12] Revert "ls1088a: remove dhcp function from u-boot env as boot source"

[Mian Yousaf Kaukab]

dhcp boot is a useful feature and works out-of-the-box for ls1088a
platforms. Moreover, no solid reason is given for disabling it.
Revert the patch to re-enable it.

This reverts commit 863e42e8b1f9e97d87919e20e34a7b98089f7522.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1088ardb.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index f52ea4d746..6387b19dd5 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -577,7 +577,8 @@
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
-	func(SCSI, scsi, 0)
+	func(SCSI, scsi, 0) \
+	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 #endif
 
-- 
2.11.0

[U-Boot] [PATCH 04/12] nxp: ls1088a: use default scan_dev_for_boot

[Mian Yousaf Kaukab]

Default environment variable is more complete. Also scans for efi
binaries for example.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1088ardb.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 6387b19dd5..45af087dc6 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -393,12 +393,6 @@
 				"run scan_dev_for_boot; "	\
 			"fi; "					\
 		"done\0"					\
-	"scan_dev_for_boot="					\
-		"echo Scanning ${devtype} "			\
-		"${devnum}:${distro_bootpart}...; "		\
-		"for prefix in ${boot_prefixes}; do "		\
-			"run scan_dev_for_scripts; "		\
-		"done;\0"					\
 	"boot_a_script="					\
 		"load ${devtype} ${devnum}:${distro_bootpart} " \
 		"${scriptaddr} ${prefix}${script}; "		\
@@ -466,12 +460,6 @@
 				"run scan_dev_for_boot; "	\
 			"fi; "					\
 		"done\0"					\
-	"scan_dev_for_boot="					\
-		"echo Scanning ${devtype} "			\
-		"${devnum}:${distro_bootpart}...; "		\
-		"for prefix in ${boot_prefixes}; do "		\
-			"run scan_dev_for_scripts; "		\
-		"done;\0"					\
 	"boot_a_script="					\
 		"load ${devtype} ${devnum}:${distro_bootpart} " \
 		"${scriptaddr} ${prefix}${script}; "		\
-- 
2.11.0

[U-Boot] [PATCH 05/12] Revert "ls2080ardb: remove dhcp function from env as boot source"

[Mian Yousaf Kaukab]

dhcp boot is a useful feature and works out-of-the-box for ls2088a
platforms. Moreover, no solid reason is given for disabling it.
Revert the patch to re-enable it.

This reverts commit aea5cd75e63c20de4c00ce24a93eeee8542f923e.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls2080ardb.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index ef0f4ff48e..d3d759533d 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -333,7 +333,8 @@ unsigned long get_board_sys_clk(void);
 #define BOOT_TARGET_DEVICES(func) \
 	func(USB, usb, 0) \
 	func(MMC, mmc, 0) \
-	func(SCSI, scsi, 0)
+	func(SCSI, scsi, 0) \
+	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_TFABOOT
-- 
2.11.0

[U-Boot] [PATCH 06/12] nxp: ls2080a: use default scan_dev_for_boot

[Mian Yousaf Kaukab]

Default environment variable is more complete. Also scans for efi
binaries for example.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls2080ardb.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index d3d759533d..7308d72e5d 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -429,12 +429,6 @@ unsigned long get_board_sys_clk(void);
 				"run scan_dev_for_boot; "	\
 			"fi; "					\
 		"done\0"					\
-	"scan_dev_for_boot="					\
-		"echo Scanning ${devtype} "			\
-			"${devnum}:${distro_bootpart}...; "	\
-		"for prefix in ${boot_prefixes}; do "		\
-			"run scan_dev_for_scripts; "		\
-		"done;\0"					\
 	"boot_a_script="					\
 		"load ${devtype} ${devnum}:${distro_bootpart} "	\
 			"${scriptaddr} ${prefix}${script}; "	\
@@ -498,12 +492,6 @@ unsigned long get_board_sys_clk(void);
 				"run scan_dev_for_boot; "	\
 			"fi; "					\
 		"done\0"					\
-	"scan_dev_for_boot="					\
-		"echo Scanning ${devtype} "			\
-			"${devnum}:${distro_bootpart}...; "	\
-		"for prefix in ${boot_prefixes}; do "		\
-			"run scan_dev_for_scripts; "		\
-		"done;\0"					\
 	"boot_a_script="					\
 		"load ${devtype} ${devnum}:${distro_bootpart} "	\
 			"${scriptaddr} ${prefix}${script}; "	\
-- 
2.11.0

[U-Boot] [PATCH 07/12] nxp: ls1046a: enable EFI_LOADER_BOUNCE_BUFFER

[Mian Yousaf Kaukab]

EFI applications need bounce buffers to work properly on these
platforms.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 configs/ls1046aqds_SECURE_BOOT_defconfig        | 1 +
 configs/ls1046aqds_defconfig                    | 1 +
 configs/ls1046aqds_lpuart_defconfig             | 1 +
 configs/ls1046aqds_nand_defconfig               | 1 +
 configs/ls1046aqds_qspi_defconfig               | 1 +
 configs/ls1046aqds_sdcard_ifc_defconfig         | 1 +
 configs/ls1046aqds_sdcard_qspi_defconfig        | 1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig    | 1 +
 configs/ls1046aqds_tfa_defconfig                | 1 +
 configs/ls1046ardb_emmc_defconfig               | 1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig   | 1 +
 configs/ls1046ardb_qspi_defconfig               | 1 +
 configs/ls1046ardb_qspi_spl_defconfig           | 1 +
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 +
 configs/ls1046ardb_sdcard_defconfig             | 1 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig    | 1 +
 configs/ls1046ardb_tfa_defconfig                | 1 +
 17 files changed, 17 insertions(+)

diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig
index ae05dd150b..f54cefe1c6 100644
--- a/configs/ls1046aqds_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_SECURE_BOOT_defconfig
@@ -52,3 +52,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig
index f7a35dfeb9..b815fc9819 100644
--- a/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_defconfig
@@ -55,3 +55,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig
index 0a8d51e43d..23d7ad2b95 100644
--- a/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_lpuart_defconfig
@@ -54,3 +54,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig
index 9e11db7d7f..8b7a9fc450 100644
--- a/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@ -59,3 +59,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig
index a6bbf106e1..f951e78c5d 100644
--- a/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@ -49,3 +49,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig
index edf915fdd6..cdce673ff7 100644
--- a/configs/ls1046aqds_sdcard_ifc_defconfig
+++ b/configs/ls1046aqds_sdcard_ifc_defconfig
@@ -68,3 +68,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig
index afb76d6900..85626e1a15 100644
--- a/configs/ls1046aqds_sdcard_qspi_defconfig
+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
@@ -64,3 +64,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
index f57dda591a..44d90576c1 100644
--- a/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046aqds_tfa_SECURE_BOOT_defconfig
@@ -57,3 +57,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig
index f77aa23024..e4ccdc6d85 100644
--- a/configs/ls1046aqds_tfa_defconfig
+++ b/configs/ls1046aqds_tfa_defconfig
@@ -61,3 +61,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig
index 181fa61422..8a9fa4add1 100644
--- a/configs/ls1046ardb_emmc_defconfig
+++ b/configs/ls1046ardb_emmc_defconfig
@@ -60,3 +60,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
index d8eb7b7ede..07437e9bc1 100644
--- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
@@ -46,3 +46,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
index fa4a08f024..d2850480d6 100644
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -49,3 +49,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig
index 0a45653b98..6d1f190230 100644
--- a/configs/ls1046ardb_qspi_spl_defconfig
+++ b/configs/ls1046ardb_qspi_spl_defconfig
@@ -63,3 +63,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_SPL_GZIP=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
index 80c42c5bad..643a52039a 100644
--- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
@@ -61,3 +61,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig
index a1bd39b17c..f1ae80628d 100644
--- a/configs/ls1046ardb_sdcard_defconfig
+++ b/configs/ls1046ardb_sdcard_defconfig
@@ -59,3 +59,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
index d570c6de05..deeb3c2de3 100644
--- a/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046ardb_tfa_SECURE_BOOT_defconfig
@@ -47,3 +47,4 @@ CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig
index fdc2521504..c86e182459 100644
--- a/configs/ls1046ardb_tfa_defconfig
+++ b/configs/ls1046ardb_tfa_defconfig
@@ -51,3 +51,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
-- 
2.11.0

[U-Boot] [PATCH 08/12] nxp: ls1046a: enable dhcp boot

[Mian Yousaf Kaukab]

dhcp boot is a useful feature and works out-of-the-box on these
platforms. Enable it as a boot source.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1046a_common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 6e36c9339b..eb4c78f549 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -213,7 +213,8 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(SCSI, scsi, 0) \
 	func(MMC, mmc, 0) \
-	func(USB, usb, 0)
+	func(USB, usb, 0) \
+	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 #endif
 
-- 
2.11.0

[U-Boot] [PATCH 09/12] nxp: ls1046a: use default scan_dev_for_boot

[Mian Yousaf Kaukab]

Default environment variable is more complete. Also scans for efi
binaries for example.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1046a_common.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index eb4c78f549..da1cfc0b88 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -260,13 +260,6 @@
 			"run scan_dev_for_boot; "            \
 		  "fi; "                                   \
 		"done\0"                                   \
-	"scan_dev_for_boot="				  \
-		"echo Scanning ${devtype} "		  \
-				"${devnum}:${distro_bootpart}...; "  \
-		"for prefix in ${boot_prefixes}; do "	  \
-			"run scan_dev_for_scripts; "	  \
-		"done;"					  \
-		"\0"					  \
 	"boot_a_script="				  \
 		"load ${devtype} ${devnum}:${distro_bootpart} "  \
 			"${scriptaddr} ${prefix}${script}; "    \
-- 
2.11.0

[U-Boot] [PATCH 10/12] nxp: ls1043a: enable EFI_LOADER_BOUNCE_BUFFER

[Mian Yousaf Kaukab]

EFI applications need bounce buffers to work properly on these
platforms.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 configs/ls1043aqds_defconfig                    | 1 +
 configs/ls1043aqds_lpuart_defconfig             | 1 +
 configs/ls1043aqds_nand_defconfig               | 1 +
 configs/ls1043aqds_nor_ddr3_defconfig           | 1 +
 configs/ls1043aqds_qspi_defconfig               | 1 +
 configs/ls1043aqds_sdcard_ifc_defconfig         | 1 +
 configs/ls1043aqds_sdcard_qspi_defconfig        | 1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig    | 1 +
 configs/ls1043aqds_tfa_defconfig                | 1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig        | 1 +
 configs/ls1043ardb_defconfig                    | 1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig   | 1 +
 configs/ls1043ardb_nand_defconfig               | 1 +
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 +
 configs/ls1043ardb_sdcard_defconfig             | 1 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig    | 1 +
 configs/ls1043ardb_tfa_defconfig                | 1 +
 17 files changed, 17 insertions(+)

diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig
index 8bde83deda..a0f9d62d3b 100644
--- a/configs/ls1043aqds_defconfig
+++ b/configs/ls1043aqds_defconfig
@@ -53,3 +53,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig
index 79448129bd..32da83fcd8 100644
--- a/configs/ls1043aqds_lpuart_defconfig
+++ b/configs/ls1043aqds_lpuart_defconfig
@@ -52,3 +52,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig
index ada225c3b6..5e7dbf9e46 100644
--- a/configs/ls1043aqds_nand_defconfig
+++ b/configs/ls1043aqds_nand_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig
index e86d4196b5..acbacfc132 100644
--- a/configs/ls1043aqds_nor_ddr3_defconfig
+++ b/configs/ls1043aqds_nor_ddr3_defconfig
@@ -51,3 +51,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig
index d948981080..a7e3327739 100644
--- a/configs/ls1043aqds_qspi_defconfig
+++ b/configs/ls1043aqds_qspi_defconfig
@@ -46,3 +46,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig
index afa91e8b3a..01279cfe3b 100644
--- a/configs/ls1043aqds_sdcard_ifc_defconfig
+++ b/configs/ls1043aqds_sdcard_ifc_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig
index 310cb2319a..6be253f8a2 100644
--- a/configs/ls1043aqds_sdcard_qspi_defconfig
+++ b/configs/ls1043aqds_sdcard_qspi_defconfig
@@ -59,3 +59,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
index ce6f1ef86f..881518444d 100644
--- a/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043aqds_tfa_SECURE_BOOT_defconfig
@@ -55,3 +55,4 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043aqds_tfa_defconfig b/configs/ls1043aqds_tfa_defconfig
index dfd70b5312..08b4c4afa0 100644
--- a/configs/ls1043aqds_tfa_defconfig
+++ b/configs/ls1043aqds_tfa_defconfig
@@ -56,3 +56,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig
index 0a51540674..3f5e0b720a 100644
--- a/configs/ls1043ardb_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
@@ -48,3 +48,4 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig
index 1462a44369..b1b46b1737 100644
--- a/configs/ls1043ardb_defconfig
+++ b/configs/ls1043ardb_defconfig
@@ -46,3 +46,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
index 8a45f7c8d0..0feeb64f71 100644
--- a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig
index 509f2f1e3c..a232b45a79 100644
--- a/configs/ls1043ardb_nand_defconfig
+++ b/configs/ls1043ardb_nand_defconfig
@@ -63,3 +63,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
index 33ce8acd08..753957f658 100644
--- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
@@ -63,3 +63,4 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig
index 91dac81e8b..23e54603bb 100644
--- a/configs/ls1043ardb_sdcard_defconfig
+++ b/configs/ls1043ardb_sdcard_defconfig
@@ -61,3 +61,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
index 0af2594205..ef01a167c4 100644
--- a/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_tfa_SECURE_BOOT_defconfig
@@ -50,3 +50,4 @@ CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_SPL_RSA=y
 CONFIG_RSA_SOFTWARE_EXP=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig
index 93cd5450dd..43cb6f92bd 100644
--- a/configs/ls1043ardb_tfa_defconfig
+++ b/configs/ls1043ardb_tfa_defconfig
@@ -50,3 +50,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
-- 
2.11.0

[U-Boot] [PATCH 11/12] nxp: ls1043a: enable dhcp boot

[Mian Yousaf Kaukab]

dhcp boot is a useful feature and works out-of-the-box on these
platforms. Enable it as a boot source.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1043a_common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 49b014181e..27bbfb4c95 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -239,7 +239,8 @@
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
-	func(USB, usb, 0)
+	func(USB, usb, 0) \
+	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 #endif
 
-- 
2.11.0

[U-Boot] [PATCH 12/12] nxp: ls1043a: use default scan_dev_for_boot

[Mian Yousaf Kaukab]

Default environment variable is more complete. Also scans for efi
binaries for example.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
 include/configs/ls1043a_common.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 27bbfb4c95..baaaa52c8f 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -281,12 +281,6 @@
 				"run scan_dev_for_boot; "	\
 			"fi; "					\
 		"done\0"			\
-	"scan_dev_for_boot="					\
-		"echo Scanning ${devtype} "			\
-			"${devnum}:${distro_bootpart}...; "	\
-		"for prefix in ${boot_prefixes}; do "		\
-			"run scan_dev_for_scripts; "		\
-		"done;\0"					\
 	"boot_a_script="					\
 		"load ${devtype} ${devnum}:${distro_bootpart} "	\
 			"${scriptaddr} ${prefix}${script}; "	\
-- 
2.11.0

[U-Boot] [PATCH 01/12] nxp: ls1088a: fix dppa exit when using efi boot

[Ashish Kumar]

> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Mian Yousaf
> Kaukab
> Sent: Tuesday, January 29, 2019 9:09 PM
> To: u-boot at lists.denx.de
> Cc: Priyanka Jain <priyanka.jain@nxp.com>
> Subject: [U-Boot] [PATCH 01/12] nxp: ls1088a: fix dppa exit when using efi boot
> 
> Same issue for ls2080a was fixed by following patch:
> b7b8410a8f ls2080: Exit dpaa only right before exiting U-Boot
> 
> Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>

Reviewed-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Patch is good to go.

Regards
Ashish 
> ---
>  board/freescale/ls1088a/ls1088a.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/board/freescale/ls1088a/ls1088a.c
> b/board/freescale/ls1088a/ls1088a.c
> index 953aab6e88..6a33958207 100644
> --- a/board/freescale/ls1088a/ls1088a.c
> +++ b/board/freescale/ls1088a/ls1088a.c
> @@ -643,6 +643,11 @@ int arch_misc_init(void)  #endif
> 
>  #ifdef CONFIG_FSL_MC_ENET
> +void board_quiesce_devices(void)
> +{
> +       fsl_mc_ldpaa_exit(gd->bd);
> +}
> +
>  void fdt_fixup_board_enet(void *fdt)
>  {
>  	int offset;
> @@ -732,7 +737,7 @@ void fsl_fdt_fixup_flash(void *fdt)
> 
>  int ft_board_setup(void *blob, bd_t *bd)  {
> -	int err, i;
> +	int i;
>  	u64 base[CONFIG_NR_DRAM_BANKS];
>  	u64 size[CONFIG_NR_DRAM_BANKS];
> 
> @@ -762,9 +767,6 @@ int ft_board_setup(void *blob, bd_t *bd)
> 
>  #ifdef CONFIG_FSL_MC_ENET
>  	fdt_fixup_board_enet(blob);
> -	err = fsl_mc_ldpaa_exit(bd);
> -	if (err)
> -		return err;
>  #endif
>  	if (is_pb_board())
>  		fixup_ls1088ardb_pb_banner(blob);
> --
> 2.11.0
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.de
> nx.de%2Flistinfo%2Fu-
> boot&amp;data=02%7C01%7CAshish.Kumar%40nxp.com%7C0dcdee6f35204c
> 1d80b408d6860013cf%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%
> 7C636843732233772401&amp;sdata=47xZKLsi8ISbyaNswO0vr4WhOwkNl7lzX
> QZ7AoK0KnU%3D&amp;reserved=0

[U-Boot] [PATCH 12/12] nxp: ls1043a: use default scan_dev_for_boot

[Ashish Kumar]

> -----Original Message-----
> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Mian Yousaf
> Kaukab
> Sent: Tuesday, January 29, 2019 9:09 PM
> To: u-boot at lists.denx.de
> Cc: Priyanka Jain <priyanka.jain@nxp.com>
> Subject: [U-Boot] [PATCH 12/12] nxp: ls1043a: use default scan_dev_for_boot
> 
> Default environment variable is more complete. Also scans for efi binaries for
> example.
> 
> Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>


Reviewed-by: Ashish Kumar <Ashish.Kumar@nxp.com>

Patch-set is good to go.
Regards
Ashish

> ---
>  include/configs/ls1043a_common.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/include/configs/ls1043a_common.h
> b/include/configs/ls1043a_common.h
> index 27bbfb4c95..baaaa52c8f 100644
> --- a/include/configs/ls1043a_common.h
> +++ b/include/configs/ls1043a_common.h
> @@ -281,12 +281,6 @@
>  				"run scan_dev_for_boot; "	\
>  			"fi; "					\
>  		"done\0"			\
> -	"scan_dev_for_boot="					\
> -		"echo Scanning ${devtype} "			\
> -			"${devnum}:${distro_bootpart}...; "	\
> -		"for prefix in ${boot_prefixes}; do "		\
> -			"run scan_dev_for_scripts; "		\
> -		"done;\0"					\
>  	"boot_a_script="					\
>  		"load ${devtype} ${devnum}:${distro_bootpart} "	\
>  			"${scriptaddr} ${prefix}${script}; "	\
> --
> 2.11.0
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.de
> nx.de%2Flistinfo%2Fu-
> boot&amp;data=02%7C01%7CAshish.Kumar%40nxp.com%7C5a14ead970604e
> d4495308d68600ba6c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%
> 7C636843735039456923&amp;sdata=NrQOamGGbtmlkwhE%2BuS7FawEyJjP
> Wt3hjkplZC3m%2Bb4%3D&amp;reserved=0

[U-Boot] [PATCH 00/12] nxp: fix dhcp and efi boot support for various socs

[Prabhakar Kushwaha]

> -----Original Message-----
> From: Mian Yousaf Kaukab <ykaukab@suse.de>
> Sent: Tuesday, January 29, 2019 9:08 PM
> To: u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Priyanka Jain
> <priyanka.jain@nxp.com>; York Sun <york.sun@nxp.com>; Mian Yousaf Kaukab
> <ykaukab@suse.de>
> Subject: [PATCH 00/12] nxp: fix dhcp and efi boot support for various socs
> 
> This patch series fixes dhcp and efi boot support for nxp ls1043a, ls1046a,
> ls1088a and ls208xa platforms.
> 
> Patches are independent and can be cherry-picked individually.
> 
> Thank you,
> 
> Best regards,
> Yousaf
> 

Subject change in all patches and fix checkpatch warnings for 2 patches

This patch set has been applied to fsl-qoriq master, awaiting upstream.

--pk