summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/am65xx-evm.conf6
-rw-r--r--conf/machine/am65xx-hs-evm-k3r5-sr2.conf11
-rw-r--r--conf/machine/am65xx-hs-evm-k3r5.conf1
-rw-r--r--conf/machine/include/am65xx.inc6
4 files changed, 18 insertions, 6 deletions
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 @@
4 4
5require conf/machine/include/am65xx.inc 5require conf/machine/include/am65xx.inc
6 6
7BBMULTICONFIG += "k3r5-sr2"
8
9UBOOT_MACHINE = "am65x_evm_a53_defconfig" 7UBOOT_MACHINE = "am65x_evm_a53_defconfig"
10
11IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
12do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
13do_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 @@
1#@TYPE: Machine
2#@NAME: AM65xx SR2.0 HS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
4
5# Booting SR2 requires different SYSFW, the rest is handled at runtime
6
7require conf/machine/am65xx-hs-evm-k3r5.conf
8SOC_FAMILY_append = ":k3r5-sr2"
9
10SYSFW_SOC = "am65x_sr2"
11SYSFW_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
7SYSFW_SOC = "am65x" 7SYSFW_SOC = "am65x"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs" 9SYSFW_SUFFIX = "hs"
10SYSFW_SYMLINK = ""
10 11
11UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" 12UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"
12 13
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 = " \
21 ti/k3-am654-evm-prupwm.dtbo \ 21 ti/k3-am654-evm-prupwm.dtbo \
22" 22"
23 23
24BBMULTICONFIG += "k3r5-sr2"
25
26IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
27do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
28do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
29
24OPTEEMACHINE = "k3-am65x" 30OPTEEMACHINE = "k3-am65x"
25OPTEEOUTPUTMACHINE = "k3" 31OPTEEOUTPUTMACHINE = "k3"
26 32