Message ID | 20250402-u-boot-meson64-move-dfu-end-v1-1-68399499ee29@linaro.org |
---|---|
State | New |
Headers | show |
Series | configs: meson64: move DFU step at the end to give the board a chance to boot something on storage | expand |
On Wed Apr 2, 2025 at 2:02 PM UTC, Neil Armstrong via groups.io wrote: > The DFU was set to run at the beginning, but we may want to > boot something over USB, MMC or Ethernet even if booted over > USB, so move the DFU as the final fallback. > > This keeps the current Amlogic U-Boot CI working and makes > the default config more generic. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Acked-by: Ferass El Hafidi <funderscore@postmarketos.org> Thanks! > --- > include/configs/meson64.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/configs/meson64.h b/include/configs/meson64.h > index f3275b37a516da6befd41324ddb2a3fe1f36fc83..675df623311f361f3a55971c3894ffbe1d07fee6 100644 > --- a/include/configs/meson64.h > +++ b/include/configs/meson64.h > @@ -118,13 +118,13 @@ > #ifndef BOOT_TARGET_DEVICES > #define BOOT_TARGET_DEVICES(func) \ > func(ROMUSB, romusb, na) \ > - func(USB_DFU, usbdfu, na) \ > BOOT_TARGET_MMC(func) \ > BOOT_TARGET_DEVICES_USB(func) \ > BOOT_TARGET_NVME(func) \ > BOOT_TARGET_SCSI(func) \ > BOOT_TARGET_PXE(func) \ > - BOOT_TARGET_DHCP(func) > + BOOT_TARGET_DHCP(func) \ > + func(USB_DFU, usbdfu, na) > #endif > > #define BOOTM_SIZE __stringify(0x1700000) > > --- > base-commit: c17f03a7e93dfbbe5d32f5738274187065d9493f > change-id: 20250402-u-boot-meson64-move-dfu-end-eb9f5fe55608 > > Best regards,
diff --git a/include/configs/meson64.h b/include/configs/meson64.h index f3275b37a516da6befd41324ddb2a3fe1f36fc83..675df623311f361f3a55971c3894ffbe1d07fee6 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -118,13 +118,13 @@ #ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(ROMUSB, romusb, na) \ - func(USB_DFU, usbdfu, na) \ BOOT_TARGET_MMC(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_NVME(func) \ BOOT_TARGET_SCSI(func) \ BOOT_TARGET_PXE(func) \ - BOOT_TARGET_DHCP(func) + BOOT_TARGET_DHCP(func) \ + func(USB_DFU, usbdfu, na) #endif #define BOOTM_SIZE __stringify(0x1700000)
The DFU was set to run at the beginning, but we may want to boot something over USB, MMC or Ethernet even if booted over USB, so move the DFU as the final fallback. This keeps the current Amlogic U-Boot CI working and makes the default config more generic. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- include/configs/meson64.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: c17f03a7e93dfbbe5d32f5738274187065d9493f change-id: 20250402-u-boot-meson64-move-dfu-end-eb9f5fe55608 Best regards,