From 8d9da5e9ca3bb32b623e7526a39cc6f053412748 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 23 Oct 2020 01:08:19 +0000 Subject: conf/machine: extend SR2.0 support from AM65 GP to AM65 HS platform Signed-off-by: Denys Dmytriyenko Signed-off-by: Dan Murphy --- conf/machine/am65xx-evm.conf | 6 ------ conf/machine/am65xx-hs-evm-k3r5-sr2.conf | 11 +++++++++++ conf/machine/am65xx-hs-evm-k3r5.conf | 1 + conf/machine/include/am65xx.inc | 6 ++++++ 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 conf/machine/am65xx-hs-evm-k3r5-sr2.conf (limited to 'conf/machine') diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf index 2f3b92a8..8b6ef546 100644 --- a/conf/machine/am65xx-evm.conf +++ b/conf/machine/am65xx-evm.conf @@ -4,10 +4,4 @@ require conf/machine/include/am65xx.inc -BBMULTICONFIG += "k3r5-sr2" - UBOOT_MACHINE = "am65x_evm_a53_defconfig" - -IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" -do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" diff --git a/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf new file mode 100644 index 00000000..ef1b6fbe --- /dev/null +++ b/conf/machine/am65xx-hs-evm-k3r5-sr2.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM65xx SR2.0 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core) + +# Booting SR2 requires different SYSFW, the rest is handled at runtime + +require conf/machine/am65xx-hs-evm-k3r5.conf +SOC_FAMILY_append = ":k3r5-sr2" + +SYSFW_SOC = "am65x_sr2" +SYSFW_SYMLINK = "sysfw.itb" diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf index 2b06f2cc..d6d4b1e3 100644 --- a/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/conf/machine/am65xx-hs-evm-k3r5.conf @@ -7,6 +7,7 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_SYMLINK = "" UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc index 67cfabed..684fea45 100644 --- a/conf/machine/include/am65xx.inc +++ b/conf/machine/include/am65xx.inc @@ -21,6 +21,12 @@ KERNEL_DEVICETREE = " \ ti/k3-am654-evm-prupwm.dtbo \ " +BBMULTICONFIG += "k3r5-sr2" + +IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" +do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" + OPTEEMACHINE = "k3-am65x" OPTEEOUTPUTMACHINE = "k3" -- cgit v1.2.3-54-g00ecf