Skip to contentSkip to conversation

conf/machine: extend SR2.0 support from AM65 GP to AM65 HS platform

PATCH New Denys Dmytriyenko 1 participant 1 message Oct 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf/machine: extend SR2.0 support from AM65 GP to AM65 HS platform

From: Denys Dmytriyenko <[email protected]>

---
 conf/machine/am65xx-evm.conf                                        | 6 ------
 .../{am65xx-evm-k3r5-sr2.conf => am65xx-hs-evm-k3r5-sr2.conf}       | 6 +++---
 conf/machine/am65xx-hs-evm-k3r5.conf                                | 1 +
 conf/machine/include/am65xx.inc                                     | 6 ++++++
 4 files changed, 10 insertions(+), 9 deletions(-)
 copy conf/machine/{am65xx-evm-k3r5-sr2.conf => am65xx-hs-evm-k3r5-sr2.conf} (52%)
conf/machine/am65xx-evm.conf +0 -6
index 2f3b92a..8b6ef54 100644
@@ -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"
conf/machine/am65xx-hs-evm-k3r5-sr2.conf renamed from conf/machine/am65xx-evm-k3r5-sr2.conf +3 -3
similarity index 52%
copy from conf/machine/am65xx-evm-k3r5-sr2.conf
copy to conf/machine/am65xx-hs-evm-k3r5-sr2.conf
index c0b3cd5..ef1b6fb 100644
@@ -1,10 +1,10 @@
 #@TYPE: Machine
-#@NAME: AM65xx SR2.0 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core)
+#@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-evm-k3r5.conf
+require conf/machine/am65xx-hs-evm-k3r5.conf
 SOC_FAMILY_append = ":k3r5-sr2"
 
 SYSFW_SOC = "am65x_sr2"
conf/machine/am65xx-hs-evm-k3r5.conf +1 -0
index 2b06f2c..d6d4b1e 100644
@@ -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"
 
conf/machine/include/am65xx.inc +6 -0
index 67cfabe..684fea4 100644
@@ -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"
 
Signature · 1 line
2.7.4