summaryrefslogtreecommitdiff
path: root/conf/machine/verdin-am62-k3r5.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/verdin-am62-k3r5.conf')
-rw-r--r--conf/machine/verdin-am62-k3r5.conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/conf/machine/verdin-am62-k3r5.conf b/conf/machine/verdin-am62-k3r5.conf
index ad5ab6d..0c24a57 100644
--- a/conf/machine/verdin-am62-k3r5.conf
+++ b/conf/machine/verdin-am62-k3r5.conf
@@ -9,12 +9,17 @@ require conf/machine/include/k3r5.inc
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti"
+PREFERRED_PROVIDER_virtual/bootloader:upstream:use-head-next = "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot:upstream:use-head-next = "u-boot-toradex"
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "verdin"
SYSFW_SUFFIX = "gp"
UBOOT_DFU_CONFIG = "dfu-gp"
-UBOOT_CONFIG ??= "dfu-gp sd-gp"
+# 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-gp"
UBOOT_CONFIG[dfu-gp] = "verdin-am62_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
UBOOT_CONFIG[sd-gp] = "verdin-am62_r5_defconfig,sdcard,spl/u-boot-spl.bin"