subtree updatesnanbield

meta-arm: 9a4ae38e84..150169d01f:
  Jon Mason (1):
        arm/linux-yocto: backport patch to fix 6.5.13 networking issues

meta-raspberrypi: fde68b24f0..fd79e74cbc:
  Khem Raj (2):
        linux-raspberrypi_6.1.bb: Upgrade to 6.1.74
        linux-raspberrypi: Upgrade to 6.1.77

  Martin Jansa (1):
        u-boot: backport one commit from v2024.01 to fix booting from uSD

poky: 1a5c00f00c..7b8aa378d0:
  Alex Kiernan (1):
        wireless-regdb: Upgrade 2023.09.01 -> 2024.01.23

  Alexander Kanavin (3):
        linux-firmware: upgrade 20231211 -> 20240220
        sdk-manual: correctly describe separate build-sysroots tasks in direct sdk workflows
        dev-manual: improve descriptions of 'bitbake -S printdiff'

  BELOUARGA Mohamed (1):
        ref-manual: add documentation of the variable SPDX_NAMESPACE_PREFIX

  Bruce Ashfield (2):
        linux-yocto/6.1: update to v6.1.78
        linux-yocto/6.1: update CVE exclusions

  Claus Stovgaard (1):
        wpa-supplicant: Fix CVE-2023-52160

  Dhairya Nagodra (2):
        glibc: Remove duplicate entry for CVE-2023-4527
        xwayland: upgrade 23.2.3 -> 23.2.4

  Geoff Parker (1):
        ref-manual: variables: adding multiple groups in GROUPADD_PARAM

  Johan Bezem (1):
        ref-manual: variables: correct sdk installation default path

  Khem Raj (1):
        core-image-ptest: Increase disk size to 1.5G for strace ptest image

  Lee Chee Yang (3):
        libxml2: upgrade to 2.11.7
        openssl: upgrade to 3.1.5
        migration-guides: add release notes for 4.0.17

  Luca Ceresoli (2):
        ref-manual: tasks: do_cleanall: recommend using '-f' instead
        ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate

  Martin Jansa (1):
        contributor-guide: be more specific about meta-* trees

  Michael Halstead (1):
        yocto-uninative: Update to 4.4 for glibc 2.39

  Michael Opdenacker (13):
        ref-manual: system-requirements: update packages to build docs
        ref-manual: release-process: grammar fix
        manuals: suppress excess use of "following" word
        dev-manual: packages: clarify shared PR service constraint
        dev-manual: packages: need enough free space
        dev-manual: packages: fix capitalization
        manuals: document VIRTUAL-RUNTIME variables
        manuals: add initial stylechecks with Vale
        profile-manual: usage.rst: formatting fixes
        manuals: use "manual page(s)"
        profile-manual: usage.rst: fix reference to bug report
        documentation: Makefile: remove releases.rst in "make clean"
        profile-manual: usage.rst: further style improvements

  Munehisa Kamata (1):
        kernel.bbclass: Set pkg-config variables for building modules

  Pavel Zhukov (1):
        mdadm: Disable ptests

  Priyal Doshi (1):
        tzdata : Upgrade to 2024a

  Ross Burton (4):
        curl: improve run-ptest
        curl: increase test timeouts
        openssl: fix crash on aarch64 if BTI is enabled but no Crypto instructions
        gstreamer1.0: skip a test that is known to be flaky

  Simone Weiß (4):
        dev-manual: Rephrase spdx creation
        gnutls: Upgrade 3.8.2 -> 3.8.3
        contributor-guide: add notes for tests
        cve-check: Log if CVE_STATUS set but not reported for component

  Soumya Sambu (1):
        bind: Upgrade 9.18.21 -> 9.18.24

  Steve Sakoman (3):
        poky.conf: bump version for 4.3.4 release
        build-appliance-image: Update to nanbield head revision
        build-appliance-image: Update to nanbield head revision

  Tim Orling (1):
        vim: upgrade v9.0.2130 -> v9.0.2190

  Wang Mingyu (3):
        python3-jinja2: upgrade 3.1.2 -> 3.1.3
        bind: upgrade 9.18.20 -> 9.18.21
        gnutls: upgrade 3.8.1 -> 3.8.2

  Yoann Congal (6):
        cve-update-nvd2-native: Fix typo in comment
        cve-update-nvd2-native: Add an age threshold for incremental update
        cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition
        cve-update-nvd2-native: nvd_request_next: Improve comment
        cve-update-nvd2-native: Fix CVE configuration update
        cve-update-nvd2-native: Remove rejected CVE from database

Change-Id: I041c2504ee3a1b3275770a6949606db7f6e22ee0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

2 files changed, 110 insertions, 0 deletions

diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot/0001-bootstd-Scan-all-bootdevs-in-a-boot_targets-entry.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot/0001-bootstd-Scan-all-bootdevs-in-a-boot_targets-entry.patch
new file mode 100644
index 0000000000..9d5786d0a6
--- /dev/null
+++ b/meta-raspberrypi/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);
diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2023.10.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2023.10.bbappend
new file mode 100644
index 0000000000..150412268a
--- /dev/null
+++ b/meta-raspberrypi/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"