summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2024-05-08 15:50:04 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2024-05-08 15:50:04 +0200
commit4d5907acdfdd2eabac1ee179025945f75361e522 (patch)
treee09570b1112bf03d91bafd883ed1f6eb86c8940e
parentd2b57d4eea25aa36458a59f52c79aca57333c8b5 (diff)
aquila-am69: use the aquila defconfigs
Aquila AM69 was added to u-boot-toradex-ti. Change the machine to use that. Related-to: ELB-5482 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/aquila-am69-k3r5.conf12
-rw-r--r--conf/machine/aquila-am69.conf6
2 files changed, 6 insertions, 12 deletions
diff --git a/conf/machine/aquila-am69-k3r5.conf b/conf/machine/aquila-am69-k3r5.conf
index e4ea3dc..dcdc8ac 100644
--- a/conf/machine/aquila-am69-k3r5.conf
+++ b/conf/machine/aquila-am69-k3r5.conf
@@ -13,10 +13,8 @@ PREFERRED_PROVIDER_virtual/bootloader:upstream = "u-boot-toradex"
PREFERRED_PROVIDER_u-boot:upstream = "u-boot-toradex"
PREFERRED_VERSION_u-boot-toradex:upstream = "mainline"
-SYSFW_SOC = "j784s4"
-# TODO:
-# - Update SYSFW_CONFIG to "aquila" once we have it available.
-SYSFW_CONFIG = "evm"
+SYSFW_SOC = "am69"
+SYSFW_CONFIG = "aquila"
SYSFW_SUFFIX = "hs-fs"
UBOOT_DFU_CONFIG = "dfu"
@@ -24,7 +22,5 @@ UBOOT_DFU_CONFIG = "dfu"
# if booting from DFU/USB.
UBOOT_DFU_CONFIG:upstream = ""
UBOOT_CONFIG ??= "${UBOOT_DFU_CONFIG} sd"
-# TODO change to the 'aquila defconfigs' and actually add a dfu config
-# rework the U-Boot recipe to deploy the dfu binary
-UBOOT_CONFIG[dfu] = "j784s4_evm_r5_defconfig,dfu,spl/u-boot-spl.bin"
-UBOOT_CONFIG[sd] = "j784s4_evm_r5_defconfig,sdcard,spl/u-boot-spl.bin"
+UBOOT_CONFIG[dfu] = "aquila-am69_r5_usbdfu_defconfig,dfu,spl/u-boot-spl.bin"
+UBOOT_CONFIG[sd] = "aquila-am69_r5_defconfig,sdcard,spl/u-boot-spl.bin"
diff --git a/conf/machine/aquila-am69.conf b/conf/machine/aquila-am69.conf
index 5022954..9488870 100644
--- a/conf/machine/aquila-am69.conf
+++ b/conf/machine/aquila-am69.conf
@@ -47,8 +47,7 @@ KERNEL_IMAGETYPES = "fitImage Image Image.gz"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "j784s4_evm_a72_defconfig,sdcard"
-# UBOOT_CONFIG[sd] = "aquila-am69_a72_defconfig,sdcard"
+UBOOT_CONFIG[sd] = "aquila-am69_a72_defconfig,sdcard"
UBOOT_ENTRYPOINT = "0x80200000"
UBOOT_LOADADDRESS = "0x80200000"
@@ -70,8 +69,7 @@ IMAGE_FSTYPES:append = " teziimg"
# The payload offsets are given in number of 512 byte blocks.
# tiboot3.bin
OFFSET_BOOTROM_PAYLOAD = "0"
-# TODO change to aquila tiboot3
-FIRMWARE_BINARY[0088] = "tiboot3-j784s4-hs-fs-evm.bin"
+FIRMWARE_BINARY[0088] = "tiboot3-am69-hs-fs-aquila.bin"
# tispl.bin
OFFSET_FW_PAYLOAD = "2048"
# u-boot.img