From faa0d7ee8f7a9c589005ade8cd4f552628e07614 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 12 Dec 2022 18:29:15 +0100 Subject: [PATCH] `odroidc2`: u-boot: use minimal patchset for v22.01 u-boot - symptoms: - no video display in u-boot - can't boot from SD (but does from eMMC) - this has proven to solve nothing, but is still neat - real problem is probably the FIP? --- config/boards/odroidc2.conf | 1 + .../meson64-boot-usb-nvme-scsi-first.patch | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 patch/u-boot/v2022.01/meson64-boot-usb-nvme-scsi-first.patch diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf index 0e3b8b554..0093702cc 100644 --- a/config/boards/odroidc2.conf +++ b/config/boards/odroidc2.conf @@ -6,3 +6,4 @@ KERNEL_TARGET="current,edge" FULL_DESKTOP="yes" ASOUND_STATE="asound.state.mesongx" BOOTBRANCH_BOARD="tag:v2022.01" +BOOTPATCHDIR="v2022.01" diff --git a/patch/u-boot/v2022.01/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2022.01/meson64-boot-usb-nvme-scsi-first.patch new file mode 100644 index 000000000..cec174d22 --- /dev/null +++ b/patch/u-boot/v2022.01/meson64-boot-usb-nvme-scsi-first.patch @@ -0,0 +1,26 @@ +Subject: [PATCH] meson64 boot stuff first +--- +Index: include/configs/meson64.h +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/include/configs/meson64.h b/include/configs/meson64.h +--- a/include/configs/meson64.h (revision d637294e264adfeb29f390dfc393106fd4d41b17) ++++ b/include/configs/meson64.h (revision 53886e58a1b76a466bf6c8cb75e70dfefe97cd02) +@@ -71,12 +71,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