From 587a278dabe1aea949cd9926dc946b6e396fe7ee Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 6 Oct 2023 14:28:27 +0200 Subject: [PATCH] radxa-zero2: bump u-boot to v2023.10 --- config/boards/radxa-zero2.wip | 8 +++-- .../meson64-boot-usb-nvme-scsi-first.patch | 34 +++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch diff --git a/config/boards/radxa-zero2.wip b/config/boards/radxa-zero2.wip index 5daad1d4d..b2d555544 100644 --- a/config/boards/radxa-zero2.wip +++ b/config/boards/radxa-zero2.wip @@ -9,6 +9,8 @@ BOOT_LOGO="desktop" ASOUND_STATE="asound.state.radxa-zero2" BOOT_FDT_FILE="amlogic/meson-g12b-radxa-zero2.dtb" -# Newer u-boot for the Zero; Radxa's patches with new DT, Makefile and defconfig in v2022.10/board_radxa-zero2 dir -BOOTBRANCH_BOARD="tag:v2022.10" -BOOTPATCHDIR="v2022.10" +# Newer u-boot for the Zero2 +# 2022.10: Radxa's patches with new DT, Makefile and defconfig in v2022.10/board_radxa-zero2 dir; common to 22.10's meson64 boot-usb-first +# v2023.10: board-specific boot-usb-first patch; zero2 landed in upstream u-boot v2023.07-rc1 +BOOTBRANCH_BOARD="tag:v2023.10" +BOOTPATCHDIR="v2023.10" diff --git a/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch new file mode 100644 index 000000000..4676681e3 --- /dev/null +++ b/patch/u-boot/v2023.10/board_radxa-zero2/meson64-boot-usb-nvme-scsi-first.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ricardo Pardini +Date: Mon, 14 Nov 2022 14:59:45 +0100 +Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and + SCSI before SD, MMC, PXE, DHCP + +meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before SD, MMC, PXE, DHCP +--- + include/configs/meson64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/configs/meson64.h b/include/configs/meson64.h +index 801cdae4708..927919ef17a 100644 +--- a/include/configs/meson64.h ++++ b/include/configs/meson64.h +@@ -74,12 +74,12 @@ + #ifndef BOOT_TARGET_DEVICES + #define BOOT_TARGET_DEVICES(func) \ + func(ROMUSB, romusb, na) \ +- func(MMC, mmc, 0) \ +- func(MMC, mmc, 1) \ +- func(MMC, mmc, 2) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ ++ func(MMC, mmc, 0) \ ++ func(MMC, mmc, 1) \ ++ func(MMC, mmc, 2) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + #endif +-- +Armbian +