summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-04-24 09:28:21 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2023-04-27 14:57:42 +0200
commit90a96e77cf75149bbcb8e727144c1c3e871f3c1d (patch)
tree441375928ebade51161ed8e675e29fccb14c3b6d /conf
parent46a093c2e2de9427ce1abb0c1979a518973e15e5 (diff)
verdin-am62: fix gp/hs-fs/hs-se handling
meta-ti changed to additionally handle HS-FS and HS-SE devices, i.e. to provide tiboot3 for the different flavours of the SoC. They added a multiconfig for each of the flavours also renaming stuff for the gp device we use. Follow the change to have GP build again, but opt out of additionally building tiboot3 for HS-FS and HS-SE devices. meta-ti commit 12bb9e20 ("machine: Add AM62x HS-SE evm configuration") commit 053002fb ("am62xx-evm: Add AM62x HS-FS evm configuration") Related-to: ELB-5170 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/verdin-am62-k3r5-gp.conf (renamed from conf/machine/verdin-am62-k3r5.conf)0
-rw-r--r--conf/machine/verdin-am62.conf7
2 files changed, 7 insertions, 0 deletions
diff --git a/conf/machine/verdin-am62-k3r5.conf b/conf/machine/verdin-am62-k3r5-gp.conf
index 29e3461..29e3461 100644
--- a/conf/machine/verdin-am62-k3r5.conf
+++ b/conf/machine/verdin-am62-k3r5-gp.conf
diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf
index 6e27797..a641468 100644
--- a/conf/machine/verdin-am62.conf
+++ b/conf/machine/verdin-am62.conf
@@ -9,6 +9,13 @@ 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-fs"
+BBMULTICONFIG:remove = "k3r5-hs-se"
+do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+IMAGE_BOOT_FILES:remove = "tiboot3-am62x-hs-evm.bin"
+
# Don't include kernels in standard images
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""