From e1ccc56de30bf98df9f2fdacafbb88fd8bce9b12 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 22 Oct 2023 18:42:42 +0200 Subject: [PATCH] u-boot-iot2050: Add patch to restore up to 3 USB storag devices Also pending upstream. Signed-off-by: Jan Kiszka --- ...w-for-more-than-1-USB-storage-device.patch | 35 +++++++++++++++++++ recipes-bsp/u-boot/u-boot-iot2050_2023.10.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 recipes-bsp/u-boot/files/0005-iot2050-Allow-for-more-than-1-USB-storage-device.patch diff --git a/recipes-bsp/u-boot/files/0005-iot2050-Allow-for-more-than-1-USB-storage-device.patch b/recipes-bsp/u-boot/files/0005-iot2050-Allow-for-more-than-1-USB-storage-device.patch new file mode 100644 index 000000000..02ca5f471 --- /dev/null +++ b/recipes-bsp/u-boot/files/0005-iot2050-Allow-for-more-than-1-USB-storage-device.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Sun, 22 Oct 2023 17:09:33 +0200 +Subject: [PATCH] iot2050: Allow for more than 1 USB storage device + +This was lost in refactoring while some users of the IOT2050 expect it +to work: Make sure that up to 3 USB storage devices are probed. + +Fixes: 53873974a4b0 ("include: armv7: Enable distroboot across all configs") +Signed-off-by: Jan Kiszka +Reviewed-by: Heinrich Schuchardt +--- + include/configs/iot2050.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h +index 4968722d18f..94a9c767882 100644 +--- a/include/configs/iot2050.h ++++ b/include/configs/iot2050.h +@@ -15,6 +15,15 @@ + + #include + ++/* allow up to 3 USB storage devices */ ++#ifdef CONFIG_CMD_USB ++#undef BOOT_TARGET_USB ++#define BOOT_TARGET_USB(func) \ ++ func(USB, usb, 0) \ ++ func(USB, usb, 1) \ ++ func(USB, usb, 2) ++#endif ++ + /* + * This defines all MMC devices, even if the basic variant has no mmc1. + * The non-supported device will be removed from the boot targets during diff --git a/recipes-bsp/u-boot/u-boot-iot2050_2023.10.bb b/recipes-bsp/u-boot/u-boot-iot2050_2023.10.bb index fee95d3c6..9532f11f4 100644 --- a/recipes-bsp/u-boot/u-boot-iot2050_2023.10.bb +++ b/recipes-bsp/u-boot/u-boot-iot2050_2023.10.bb @@ -16,6 +16,7 @@ SRC_URI += " \ file://0002-tools-iot2050-sign-fw.sh-Make-localization-of-tools-.patch \ file://0003-board-siemens-iot2050-Fix-logical-bug-in-PG1-PG2-det.patch \ file://0004-board-siemens-iot2050-Fix-M.2-detection.patch \ + file://0005-iot2050-Allow-for-more-than-1-USB-storage-device.patch \ " SRC_URI[sha256sum] = "e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900"