uboot-layerscape: bump to LSDK-21.08

Update layerscape u-boot package to LSDK-21.08 and drop patches which
are no longer needed.

The new env variable 'fsl_bootcmd_mcinitcmd_set' is needed to protect
the configured bootcmd and mc_init values. See [1] for more
informations.

[1] https://source.denx.de/u-boot/u-boot/-/commit/b62c174e861bddc3c7131045ed018556645cecb9

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

package/boot/uboot-layerscape/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-layerscape
-PKG_VERSION:=LSDK-20.04-update-290520
+PKG_VERSION:=LSDK-21.08
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
-PKG_SOURCE_VERSION:=1e55b2f9e7f56b76569089b9e950f49c1579580e
-PKG_MIRROR_HASH:=46aace27e1367f40b424a64215d524a99c3bd62f49057550039e72d5a1ab7edb
+PKG_SOURCE_VERSION:=LSDK-21.08
+PKG_MIRROR_HASH:=874e871755ef84ebbf35cc247f0979ec18ed1946e4dca71006a83463b2899db1
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk

package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt

@@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $loadaddr 1000000 2800000;bootm $loadaddr
 bootargs=rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),-(firmware)
 bootcmd=echo starting OpenWrt ...;pfe stop;run qspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1012a-frwy-sdboot-uEnv.txt

@@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;pfe stop;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1012a-rdb-uEnv.txt

@@ -5,3 +5,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
 bootargs=root=/dev/mtdblock8 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;pfe stop;run qspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1021a-iot-sdboot-uEnv.txt

@@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1021a-twr-sdboot-uEnv.txt

@@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1021a-twr-uEnv.txt

@@ -5,3 +5,4 @@ nor_boot=cp.b 60f00000 $fdtaddr 100000;cp.b 61000000 $loadaddr 1000000;bootm $lo
 bootargs=root=/dev/mtdblock6 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=60000000.nor:1m(rcw),2m(u-boot),1m(u-boot-env),11m(reserved-1),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware) cma=64M@0x0-0xb0000000
 bootcmd=echo starting openwrt ...;run nor_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-sdboot-uEnv.txt

@@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-uEnv.txt

@@ -6,3 +6,4 @@ nor_boot=cp.b 60f00000 $fdtaddr 100000;cp.b 61000000 $loadaddr 1000000;bootm $lo
 bootargs=root=/dev/mtdblock8 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=60000000.nor:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run nor_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1046a-frwy-sdboot-uEnv.txt

@@ -6,3 +6,4 @@ sd_boot=ext4load mmc 0:1 ${loadaddr} fitImage;bootm ${loadaddr}
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1046a-frwy-uEnv.txt

@@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
 bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run qspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-sdboot-uEnv.txt

@@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-uEnv.txt

@@ -6,3 +6,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
 bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),3m(reserved-1),256k(fman),5888k(reserved-2),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run qspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-sdboot-uEnv.txt

@@ -8,3 +8,4 @@ sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
 bootcmd=echo starting openwrt ...;run mc_init;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-uEnv.txt

@@ -8,3 +8,4 @@ qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
 bootargs=root=/dev/mtdblock10 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run mc_init;run qspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_ls2088a-rdb-uEnv.txt

@@ -8,3 +8,4 @@ nor_boot=cp.b 580f00000 $fdtaddr 100000;cp.b 581000000 $loadaddr 1000000;bootm $
 bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS1,115200 mtdparts=580000000.nor:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run mc_init;run nor_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_lx2160a-rdb-sdboot-uEnv.txt

@@ -7,3 +7,4 @@ sd_boot=ext4load mmc 0:1 ${loadaddr} fitImage;bootm ${loadaddr}
 bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd earlycon=pl011,mmio32,0x21c0000 console=ttyAMA0,115200
 bootcmd=echo starting openwrt ...;run mc_init;run sd_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/files/fsl_lx2160a-rdb-uEnv.txt

@@ -7,3 +7,4 @@ xspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000
 bootargs=root=/dev/mtdblock9 rootfstype=squashfs,jffs2 noinitrd earlycon=pl011,mmio32,0x21c0000 console=ttyAMA0,115200 mtdparts=20c0000.spi-0:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(mc),1m(dpl),1m(dpc),1m(dtb),16m(kernel),32m(rootfs),49m@0xf00000(firmware)
 bootcmd=echo starting openwrt ...;run mc_init;run xspi_boot
 bootdelay=3
+fsl_bootcmd_mcinitcmd_set=y

package/boot/uboot-layerscape/patches/0001-board-ls1046ardb-force-PCI-device-enumeration.patch

@@ -0,0 +1,33 @@
+From 089b90b11008ec95a56da12e31d11e3f31a9bb26 Mon Sep 17 00:00:00 2001
+From: Martin Schiller <ms@dev.tdt.de>
+Date: Wed, 17 Nov 2021 07:29:55 +0100
+Subject: [PATCH] board: ls1046ardb: force PCI device enumeration
+
+Commit 045ecf899252 ("configs: enable DM_ETH support for LS1046ARDB")
+resulted in the PCI bus no longer being implicitly enumerated.
+
+However, this is necessary for the fdt pcie fixups to work.
+
+Therefore, similar to commit 8b6558bd4187 ("board: ls1088ardb:
+transition to DM_ETH"), pci_init() is now called in the board_init()
+routine when CONFIG_DM_ETH is active.
+
+Signed-off-by: Martin Schiller <ms@dev.tdt.de>
+CC: Priyanka Jain <priyanka.jain@nxp.com>
+---
+ board/freescale/ls1046ardb/ls1046ardb.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/board/freescale/ls1046ardb/ls1046ardb.c
++++ b/board/freescale/ls1046ardb/ls1046ardb.c
+@@ -88,6 +88,10 @@ int board_init(void)
+ 	ppa_init();
+ #endif
+
++#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH)
++	pci_init();
++#endif
++
+ 	/* invert AQR105 IRQ pins polarity */
+ 	out_be32(&scfg->intpcr, AQR105_IRQ_MASK);
+

package/boot/uboot-layerscape/patches/0002-board-ls1043ardb-force-PCI-device-enumeration.patch

@@ -0,0 +1,34 @@
+From 64d2dffa8b51c1beb7e472690dcac965ac0f7ac4 Mon Sep 17 00:00:00 2001
+From: Martin Schiller <ms@dev.tdt.de>
+Date: Tue, 23 Nov 2021 07:24:19 +0100
+Subject: [PATCH] board: ls1043ardb: force PCI device enumeration
+
+Commit eb1986804d1d ("configs: enable DM_ETH support for LS1043ARDB")
+resulted in the PCI bus no longer being implicitly enumerated.
+
+However, this is necessary for the fdt pcie fixups to work.
+
+Therefore, similar to commit 8b6558bd4187 ("board: ls1088ardb:
+transition to DM_ETH"), pci_init() is now called in the board_init()
+routine when CONFIG_DM_ETH is active.
+
+Signed-off-by: Martin Schiller <ms@dev.tdt.de>
+CC: Priyanka Jain <priyanka.jain@nxp.com>
+CC: Camelia Groza <camelia.groza@nxp.com>
+---
+ board/freescale/ls1043ardb/ls1043ardb.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/board/freescale/ls1043ardb/ls1043ardb.c
++++ b/board/freescale/ls1043ardb/ls1043ardb.c
+@@ -214,6 +214,10 @@ int board_init(void)
+ 	ppa_init();
+ #endif
+
++#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH)
++	pci_init();
++#endif
++
+ #ifdef CONFIG_U_QE
+ 	u_qe_init();
+ #endif