From e625b874b1f7ff5ebe1e1852ab7f7c5a20a4e7cc Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 7 Sep 2022 11:03:15 -0500 Subject: conf: machine: am64xx: Move multi-config targets into base SoC include The supported device types depends on the SoC, not on any specific board or EVM. Any board can be populated with any of the 3 supported AM64x types. Move these into the AM64x common include. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- conf/machine/am64xx-evm.conf | 12 ------------ conf/machine/include/am64xx.inc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index d9afb08e..c6ba2a87 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -5,15 +5,3 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -BBMULTICONFIG += "k3r5-sr2-hs-se" -IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 0b9a3e59..913d95e6 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -14,10 +14,23 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS BBMULTICONFIG = "k3r5-sr2-hs-fs" do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" + TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" OPTEEOUTPUTMACHINE = "k3" -- cgit v1.2.3-54-g00ecf