From dbc88f2d652a08d3f0f9dbb24b7f693dec6f7f2a Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 11 Aug 2022 20:41:28 -0500 Subject: conf: machine: am64xx-evm: Make HS-SE the default The HS-SE AM64xx machine can now be run on GP devices and built without needing the TI_SECURE_DEV_PKG for the same. AM64xx will only be available in the HS-FS type going forward. Make the HS-SE the default and remove the original GP machine. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- conf/machine/am64xx-evm-k3r5-gp.conf | 20 ++++++++++++++++++++ conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 ++++++++++++++ conf/machine/am64xx-evm-k3r5.conf | 11 ----------- conf/machine/am64xx-evm.conf | 6 ++++++ conf/machine/am64xx-hs-evm-k3r5-gp.conf | 16 ---------------- conf/machine/am64xx-hs-evm-k3r5.conf | 12 ------------ conf/machine/am64xx-hs-evm.conf | 25 ------------------------- conf/machine/include/am64xx.inc | 5 +++-- conf/multiconfig/k3r5-hs-se.conf | 3 +++ 9 files changed, 46 insertions(+), 66 deletions(-) create mode 100644 conf/machine/am64xx-evm-k3r5-gp.conf create mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf delete mode 100644 conf/machine/am64xx-evm-k3r5.conf delete mode 100644 conf/machine/am64xx-hs-evm-k3r5-gp.conf delete mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf delete mode 100644 conf/machine/am64xx-hs-evm.conf create mode 100644 conf/multiconfig/k3r5-hs-se.conf (limited to 'conf') diff --git a/conf/machine/am64xx-evm-k3r5-gp.conf b/conf/machine/am64xx-evm-k3r5-gp.conf new file mode 100644 index 00000000..c599ee47 --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-gp.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM64xx GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core) + +# Booting GP requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-gp" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-evm-k3r5-hs-se.conf b/conf/machine/am64xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..7cab7d15 --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-hs-se.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf deleted file mode 100644 index afd36b72..00000000 --- a/conf/machine/am64xx-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index 2cb7f55a..d6efdf52 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -9,3 +9,9 @@ UBOOT_MACHINE = "am64x_evm_a53_defconfig" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS-SE, 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" diff --git a/conf/machine/am64xx-hs-evm-k3r5-gp.conf b/conf/machine/am64xx-hs-evm-k3r5-gp.conf deleted file mode 100644 index b255dca8..00000000 --- a/conf/machine/am64xx-hs-evm-k3r5-gp.conf +++ /dev/null @@ -1,16 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx GP EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core) - -# Booting GP requires different SYSFW, the rest is handled at runtime - -require conf/machine/am64xx-hs-evm-k3r5.conf -SOC_FAMILY_append = ":k3r5-gp" - -SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf deleted file mode 100644 index 95e68751..00000000 --- a/conf/machine/am64xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,12 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf deleted file mode 100644 index 1149d4c7..00000000 --- a/conf/machine/am64xx-hs-evm.conf +++ /dev/null @@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - -# Since default tiboot3.bin on AM64x is for HS, 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" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 930fba08..becc79d4 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -14,8 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-hs-se" +do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-hs-se.conf new file mode 100644 index 00000000..701f8e88 --- /dev/null +++ b/conf/multiconfig/k3r5-hs-se.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-se" -- cgit v1.2.3-54-g00ecf