diff --git a/0017-Backport-https-patchwork.ozlabs.org.patch b/0017-Backport-https-patchwork.ozlabs.org.patch new file mode 100644 index 0000000..9fee444 --- /dev/null +++ b/0017-Backport-https-patchwork.ozlabs.org.patch @@ -0,0 +1,83 @@ +From f4dbc6d532d05bdb3070c6492d19e268845e8a0c Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet +Date: Fri, 27 Jan 2023 15:08:55 +0100 +Subject: [PATCH] Backport + https://patchwork.ozlabs.org/project/uboot/patch/20230125230823.1567778-1-trini@konsulko.com/ + to fix boo#1207562 + +--- + configs/a3y17lte_defconfig | 1 - + configs/a5y17lte_defconfig | 1 - + configs/a7y17lte_defconfig | 1 - + configs/dragonboard845c_defconfig | 1 - + configs/qcs404evb_defconfig | 1 - + configs/starqltechn_defconfig | 1 - + lib/Kconfig | 1 - + 7 files changed, 7 deletions(-) + +diff --git a/configs/a3y17lte_defconfig b/configs/a3y17lte_defconfig +index 124fb8d476..0215c5f234 100644 +--- a/configs/a3y17lte_defconfig ++++ b/configs/a3y17lte_defconfig +@@ -24,4 +24,3 @@ CONFIG_SYS_BOOTM_LEN=0x2000000 + CONFIG_CMD_GPIO=y + CONFIG_CMD_I2C=y + CONFIG_DM_I2C_GPIO=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/configs/a5y17lte_defconfig b/configs/a5y17lte_defconfig +index ffb0b3f474..d1cd97baf5 100644 +--- a/configs/a5y17lte_defconfig ++++ b/configs/a5y17lte_defconfig +@@ -24,4 +24,3 @@ CONFIG_SYS_BOOTM_LEN=0x2000000 + CONFIG_CMD_GPIO=y + CONFIG_CMD_I2C=y + CONFIG_DM_I2C_GPIO=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/configs/a7y17lte_defconfig b/configs/a7y17lte_defconfig +index 8c1229d8d5..bef2d0945a 100644 +--- a/configs/a7y17lte_defconfig ++++ b/configs/a7y17lte_defconfig +@@ -24,4 +24,3 @@ CONFIG_SYS_BOOTM_LEN=0x2000000 + CONFIG_CMD_GPIO=y + CONFIG_CMD_I2C=y + CONFIG_DM_I2C_GPIO=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/configs/dragonboard845c_defconfig b/configs/dragonboard845c_defconfig +index a69d82761a..cef82f5610 100644 +--- a/configs/dragonboard845c_defconfig ++++ b/configs/dragonboard845c_defconfig +@@ -26,4 +26,3 @@ CONFIG_DM_PMIC=y + CONFIG_PMIC_QCOM=y + CONFIG_MSM_GENI_SERIAL=y + CONFIG_SPMI_MSM=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/configs/qcs404evb_defconfig b/configs/qcs404evb_defconfig +index dae1551411..d3608cae9f 100644 +--- a/configs/qcs404evb_defconfig ++++ b/configs/qcs404evb_defconfig +@@ -51,4 +51,3 @@ CONFIG_USB_XHCI_DWC3=y + CONFIG_USB_DWC3=y + CONFIG_USB_DWC3_GENERIC=y + CONFIG_USB_STORAGE=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/configs/starqltechn_defconfig b/configs/starqltechn_defconfig +index 7955076d61..243f3f90c5 100644 +--- a/configs/starqltechn_defconfig ++++ b/configs/starqltechn_defconfig +@@ -33,4 +33,3 @@ CONFIG_VIDEO=y + CONFIG_SYS_WHITE_ON_BLACK=y + CONFIG_VIDEO_SIMPLE=y + CONFIG_VIDEO_DT_SIMPLEFB=y +-CONFIG_LMB_MAX_REGIONS=64 +diff --git a/lib/Kconfig b/lib/Kconfig +index 3c5a4ab386..4abd987edd 100644 +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -992,7 +992,6 @@ config LMB + config LMB_USE_MAX_REGIONS + bool "Use a common number of memory and reserved regions in lmb lib" + depends on LMB +- default y + help + Define the number of supported memory regions in the library logical + memory blocks. diff --git a/u-boot.changes b/u-boot.changes index 9f9cf72..035b2f5 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Jan 27 14:10:12 UTC 2023 - Guillaume GARDET + +Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2023.01 +Prefer upstream solution to fix boo#1207562 +* Patches dropped: + 0017-rpi-fix-boot-from-USB-on-RPi4-boo-1.patch +* Patches added: + 0017-Backport-https-patchwork.ozlabs.org.patch + +------------------------------------------------------------------- +Fri Jan 27 08:09:35 UTC 2023 - Guillaume GARDET + +Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2023.01 +* Patches added to fix boot from USB on RPi4 - boo#1207562: + 0017-rpi-fix-boot-from-USB-on-RPi4-boo-1.patch + ------------------------------------------------------------------- Thu Jan 19 14:17:33 UTC 2023 - Andreas Schwab diff --git a/u-boot.spec b/u-boot.spec index a34fc6e..07e39d2 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -238,6 +238,7 @@ Patch0013: 0013-Disable-timer-check-in-file-loading.patch Patch0014: 0014-Enable-EFI-and-ISO-partitions-suppo.patch Patch0015: 0015-cmd-boot-add-brom-cmd-to-reboot-to-.patch Patch0016: 0016-cmd-boot-add-brom-cmd-to-reboot-to-.patch +Patch0017: 0017-Backport-https-patchwork.ozlabs.org.patch # Patches: end BuildRequires: bc BuildRequires: bison