summaryrefslogtreecommitdiff
path: root/conf/machine/verdin-am62.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/verdin-am62.conf')
-rw-r--r--conf/machine/verdin-am62.conf30
1 files changed, 15 insertions, 15 deletions
diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf
index e36adeb..75abfe5 100644
--- a/conf/machine/verdin-am62.conf
+++ b/conf/machine/verdin-am62.conf
@@ -9,11 +9,11 @@ MACHINE_FEATURES:remove = "efi"
require conf/machine/verdin-am62.inc
require conf/machine/include/am62xx.inc
-# override what am62xx.inc sets for a hs-fs/hs-se variant so that only
-# the gp variant is built and deployed and is the default.
-BBMULTICONFIG:remove = "k3r5-hs-se"
-do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy mc::k3r5-gp:ti-sci-fw:do_deploy"
-IMAGE_BOOT_FILES:remove = "tiboot3-am62x-hs-evm.bin"
+do_image[mcdepends] = "mc::k3r5:virtual/bootloader:do_deploy"
+
+# cope with our changed tiboot3 file names vs. the hardcoded TI AM625 SK-EVM ones
+IMAGE_BOOT_FILES:remove = "tiboot3-am62x-gp-evm.bin tiboot3-am62x-hs-evm.bin tiboot3-am62x-hs-fs-evm.bin"
+IMAGE_BOOT_FILES:append = " tiboot3-am62x-gp-verdin.bin tiboot3-am62x-hs-fs-verdin.bin tiboot3-am62x-hs-verdin.bin"
# Don't include kernels in standard images
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -22,8 +22,8 @@ MACHINE_EXTRA_RRECOMMENDS:append:am62xx = " kernel-modules"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-ti"
PREFERRED_PROVIDER_virtual/dtb = "device-tree-overlays-ti"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti"
+PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti"
KERNEL_DTB_PREFIX = "ti/"
KERNEL_DEVICETREE = " \
@@ -36,7 +36,7 @@ KERNEL_DEVICETREE = " \
"
KERNEL_IMAGETYPE = "Image.gz"
-KERNEL_IMAGETYPES = "Image Image.gz"
+KERNEL_IMAGETYPES = "fitImage Image Image.gz"
# overlays applied by generated overlays.txt
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-am62_dsi-to-hdmi_overlay.dtbo verdin-am62_spidev_overlay.dtbo"
@@ -67,13 +67,13 @@ IMAGE_FSTYPES:append = " teziimg"
# The payload offsets are given in number of 512 byte blocks.
# tiboot3.bin
OFFSET_BOOTROM_PAYLOAD = "0"
-TPL_BINARY[0069] = "tiboot3-am62x-gp-evm.bin"
-TPL_BINARY[0071] = "tiboot3-am62x-gp-evm.bin"
-TPL_BINARY[0072] = "tiboot3-am62x-gp-evm.bin"
-TPL_BINARY[0073] = "tiboot3-am62x-hs-fs-evm.bin"
-TPL_BINARY[0074] = "tiboot3-am62x-hs-fs-evm.bin"
-TPL_BINARY[0075] = "tiboot3-am62x-hs-fs-evm.bin"
-TPL_BINARY[0076] = "tiboot3-am62x-hs-fs-evm.bin"
+TPL_BINARY[0069] = "tiboot3-am62x-gp-verdin.bin"
+TPL_BINARY[0071] = "tiboot3-am62x-gp-verdin.bin"
+TPL_BINARY[0072] = "tiboot3-am62x-gp-verdin.bin"
+TPL_BINARY[0073] = "tiboot3-am62x-hs-fs-verdin.bin"
+TPL_BINARY[0074] = "tiboot3-am62x-hs-fs-verdin.bin"
+TPL_BINARY[0075] = "tiboot3-am62x-hs-fs-verdin.bin"
+TPL_BINARY[0076] = "tiboot3-am62x-hs-fs-verdin.bin"
# tispl.bin
OFFSET_TPL_PAYLOAD = "1024"
# u-boot.img