u-boot: backport one commit from v2024.01 to fix booting from uSD

* fixes:
  https://github.com/agherzan/meta-raspberrypi/issues/1338

* apply it in version specific u-boot_2023.10.bbappend so that if someone
  already uses newer version backported to nanbield it won't cause
  do_patch failure

* instead of:
  U-Boot 2023.10 (Oct 02 2023 - 14:39:59 +0000)

  DRAM:  948 MiB (effective 3.9 GiB)
  RPI 4 Model B (0xc03111)
  Core:  212 devices, 16 uclasses, devicetree: board
  MMC:   mmcnr@7e300000: 1, mmc@7e340000: 0
  Loading Environment from FAT... OK
  In:    serial,usbkbd
  Out:   serial,vidconsole
  Err:   serial,vidconsole
  Net:   eth0: ethernet@7d580000
  PCIe BRCM: link up, 5.0 Gbps x1 (SSC)
  starting USB...
  Bus xhci_pci: Register 5000420 NbrPorts 5
  Starting the controller
  USB XHCI 1.00
  scanning bus xhci_pci for devices... 2 USB Device(s) found
         scanning usb for storage devices... 0 Storage Device(s) found
  Hit any key to stop autoboot:  0
  Card did not respond to voltage select! : -110
  ethernet@7d580000 Waiting for PHY auto negotiation to complete......... TIMEOUT !
  bcmgenet: PHY startup failed: -110
  ethernet@7d580000 Waiting for PHY auto negotiation to complete......... TIMEOUT !
  bcmgenet: PHY startup failed: -110

* it boots automatically

  U-Boot 2023.10 (Oct 02 2023 - 14:39:59 +0000)

  DRAM:  948 MiB (effective 3.9 GiB)
  RPI 4 Model B (0xc03111)
  Core:  212 devices, 16 uclasses, devicetree: board
  MMC:   mmcnr@7e300000: 1, mmc@7e340000: 0
  Loading Environment from FAT... OK
  In:    serial,usbkbd
  Out:   serial,vidconsole
  Err:   serial,vidconsole
  Net:   eth0: ethernet@7d580000
  PCIe BRCM: link up, 5.0 Gbps x1 (SSC)
  starting USB...
  Bus xhci_pci: Register 5000420 NbrPorts 5
  Starting the controller
  USB XHCI 1.00
  scanning bus xhci_pci for devices... 2 USB Device(s) found
         scanning usb for storage devices... 0 Storage Device(s) found
  Hit any key to stop autoboot:  0
  Card did not respond to voltage select! : -110
  ** Booting bootflow 'mmc@7e340000.bootdev.part_1' with script
  Working FDT set to 2eff2300
  25268736 bytes read in 1099 ms (21.9 MiB/s)
  Moving Image from 0x80000 to 0x200000, end=1b30000
  ## Flattened Device Tree blob at 2eff2300
     Booting using the fdt blob at 0x2eff2300
  Working FDT set to 2eff2300
     Using Device Tree in place at 000000002eff2300, end 000000002f002f69
  Working FDT set to 2eff2300

  Starting kernel ...

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>

recipes-bsp/u-boot/u-boot/0001-bootstd-Scan-all-bootdevs-in-a-boot_targets-entry.patch

@@ -0,0 +1,107 @@
+From e824d0d0c219bc6da767f13f90c5b00eefe929f0 Mon Sep 17 00:00:00 2001
+From: Simon Glass <sjg@chromium.org>
+Date: Sat, 23 Sep 2023 14:50:15 -0600
+Subject: [PATCH] bootstd: Scan all bootdevs in a boot_targets entry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the boot_targets environment variable is used with the distro-boot
+scripts, each device is included individually. For example, if there
+are three mmc devices, then we will have something like:
+
+   boot_targets="mmc0 mmc1 mmc2"
+
+In contrast, standard boot supports specifying just the uclass, i.e.:
+
+   boot_targets="mmc"
+
+The intention is that this should scan all MMC devices, but in fact it
+currently only scans the first.
+
+Update the logic to handle this case, without required BOOTSTD_FULL to
+be enabled.
+
+I believe at least three people reported this, but I found two.
+
+Signed-off-by: Simon Glass <sjg@chromium.org>
+Reported-by: Date Huang <tjjh89017@hotmail.com>
+Reported-by: Vincent Stehlé <vincent.stehle@arm.com>
+---
+Upstream-Status: Backport [v2024.01 e824d0d0c219bc6da767f13f90c5b00eefe929f0]
+
+ boot/bootdev-uclass.c |  3 ++-
+ boot/bootflow.c       | 21 +++++++++++++++++++--
+ test/boot/bootdev.c   | 10 ++++++++++
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
+index 974ddee5d2..44ae98a926 100644
+--- a/boot/bootdev-uclass.c
++++ b/boot/bootdev-uclass.c
+@@ -469,10 +469,11 @@ int bootdev_find_by_label(const char *label, struct udevice **devp,
+ 			 * if no sequence number was provided, we must scan all
+ 			 * bootdevs for this media uclass
+ 			 */
+-			if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && seq == -1)
++			if (seq == -1)
+ 				method_flags |= BOOTFLOW_METHF_SINGLE_UCLASS;
+ 			if (method_flagsp)
+ 				*method_flagsp = method_flags;
++			log_debug("method flags %x\n", method_flags);
+ 			return 0;
+ 		}
+ 		log_debug("- no device in %s\n", media->name);
+diff --git a/boot/bootflow.c b/boot/bootflow.c
+index 6ef62e1d18..e03932e65a 100644
+--- a/boot/bootflow.c
++++ b/boot/bootflow.c
+@@ -260,8 +260,25 @@ static int iter_incr(struct bootflow_iter *iter)
+ 		} else {
+ 			log_debug("labels %p\n", iter->labels);
+ 			if (iter->labels) {
+-				ret = bootdev_next_label(iter, &dev,
+-							 &method_flags);
++				/*
++				 * when the label is "mmc" we want to scan all
++				 * mmc bootdevs, not just the first. See
++				 * bootdev_find_by_label() where this flag is
++				 * set up
++				 */
++				if (iter->method_flags & BOOTFLOW_METHF_SINGLE_UCLASS) {
++					uclass_next_device(&dev);
++					log_debug("looking for next device %s: %s\n",
++						  iter->dev->name,
++						  dev ? dev->name : "<none>");
++				} else {
++					dev = NULL;
++				}
++				if (!dev) {
++					log_debug("looking at next label\n");
++					ret = bootdev_next_label(iter, &dev,
++								 &method_flags);
++				}
+ 			} else {
+ 				ret = bootdev_next_prio(iter, &dev);
+ 				method_flags = 0;
+diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
+index 6b29213416..c5f14a7a13 100644
+--- a/test/boot/bootdev.c
++++ b/test/boot/bootdev.c
+@@ -221,6 +221,16 @@ static int bootdev_test_order(struct unit_test_state *uts)
+ 	ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
+ 	bootflow_iter_uninit(&iter);
+ 
++	/* Make sure it scans a bootdevs in each target */
++	ut_assertok(env_set("boot_targets", "mmc spi"));
++	ut_asserteq(0, bootflow_scan_first(NULL, NULL, &iter, 0, &bflow));
++	ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
++	ut_asserteq(3, iter.num_devs);
++	ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
++	ut_asserteq_str("mmc1.bootdev", iter.dev_used[1]->name);
++	ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name);
++	bootflow_iter_uninit(&iter);
++
+ 	return 0;
+ }
+ BOOTSTD_TEST(bootdev_test_order, UT_TESTF_DM | UT_TESTF_SCAN_FDT);

recipes-bsp/u-boot/u-boot_2023.10.bbappend

@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI:append:rpi = " file://0001-bootstd-Scan-all-bootdevs-in-a-boot_targets-entry.patch"

recipes-kernel/linux/linux-raspberrypi_6.1.bb

@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.1.61"
+LINUX_VERSION ?= "6.1.77"
 LINUX_RPI_BRANCH ?= "rpi-6.1.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.1"
 
-SRCREV_machine = "f364e0eb8f973e1aa24a3c451d18e84247a8efcd"
-SRCREV_meta = "29ec3dc6f4f59b731badcc864b212767023cc40c"
+SRCREV_machine = "77fc1fbcb5c013329af9583307dd1ff3cd4752aa"
+SRCREV_meta = "43d1723dbe0ce7b341cf32feeb35ecbe6b0ce29a"
 
 KMETA = "kernel-meta"