summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2024-06-12 18:19:18 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2024-06-12 18:47:57 +0200
commite4bb24ea981b0307c0a74468a3221bcdc3d19ed5 (patch)
treefd5cccad0460aff04c11195e5e70718ae1b1e77b /conf/machine
parentea58594ac5f4d0c1cf84d36068c785e6c4f5688f (diff)
u-boot-toradex-ti: stop building a second tiboot3 for usb dfu
The usb dfu configs have been merged into one defconfig. If the R5 SPL loads further binaries from eMMC or from USB is decided at runtime. Related-to: ELB-5758 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/aquila-am69-k3r5.conf7
-rw-r--r--conf/machine/verdin-am62-k3r5.conf7
2 files changed, 2 insertions, 12 deletions
diff --git a/conf/machine/aquila-am69-k3r5.conf b/conf/machine/aquila-am69-k3r5.conf
index 1936224..5d24f1d 100644
--- a/conf/machine/aquila-am69-k3r5.conf
+++ b/conf/machine/aquila-am69-k3r5.conf
@@ -17,10 +17,5 @@ SYSFW_SOC = "am69"
SYSFW_CONFIG = "aquila"
SYSFW_SUFFIX = "hs-fs"
-UBOOT_DFU_CONFIG = "dfu-r5"
-# The DFU config does not (yet) exist in upstream. It is needed only
-# if booting from DFU/USB.
-UBOOT_DFU_CONFIG:upstream = ""
-UBOOT_CONFIG ??= "${UBOOT_DFU_CONFIG} sd-r5"
-UBOOT_CONFIG[dfu-r5] = "aquila-am69_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
+UBOOT_CONFIG ??= "sd-r5"
UBOOT_CONFIG[sd-r5] = "aquila-am69_r5_defconfig,sdcard,spl/u-boot-spl.bin"
diff --git a/conf/machine/verdin-am62-k3r5.conf b/conf/machine/verdin-am62-k3r5.conf
index 700968e..797e76c 100644
--- a/conf/machine/verdin-am62-k3r5.conf
+++ b/conf/machine/verdin-am62-k3r5.conf
@@ -16,10 +16,5 @@ SYSFW_SOC = "am62x"
SYSFW_CONFIG = "verdin"
SYSFW_SUFFIX = "hs-fs"
-UBOOT_DFU_CONFIG = "dfu-r5"
-# The DFU config does not (yet) exist in upstream. It is needed only
-# if booting from DFU/USB.
-UBOOT_DFU_CONFIG:upstream = ""
-UBOOT_CONFIG ??= "${UBOOT_DFU_CONFIG} sd-r5"
-UBOOT_CONFIG[dfu-r5] = "verdin-am62_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
+UBOOT_CONFIG ??= "sd-r5"
UBOOT_CONFIG[sd-r5] = "verdin-am62_r5_defconfig,sdcard,spl/u-boot-spl.bin"