mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-20 19:53:43 +00:00
Code Issues Projects Releases Wiki Activity

conf: machine: am64xx-evm: Make HS-SE the default

Browse Source 
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 <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2022-11-04 22:46:19 +00:00
committed by Ryan Eatmon
parent be1ddf405d
commit 4457391897
10 changed files with 33 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf → meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf
View File

@@ -4,12 +4,16 @@
# Booting GP requires different SYSFW, the rest is handled at runtime
require conf/machine/am64xx-hs-evm-k3r5.conf
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}"

14
meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf Normal file
View File

@@ -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"

11
meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
View File

@@ -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"

6
meta-ti-bsp/conf/machine/am64xx-evm.conf
View File

@@ -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"

12
meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf
View File

@@ -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"

25
meta-ti-bsp/conf/machine/am64xx-hs-evm.conf
View File

@@ -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"

5
meta-ti-bsp/conf/machine/include/am64xx.inc
View File

@@ -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"

3
meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf Normal file
View File

@@ -0,0 +1,3 @@
require k3r5.conf
MACHINE:append = "-hs-se"

2
meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
View File

@@ -30,7 +30,7 @@ do_compile:append:am65xx-hs-evm() {
tfa_sign_k3hs
}
do_compile:append:am64xx-hs-evm() {
do_compile:append:am64xx-evm() {
tfa_sign_k3hs
}

2
meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
View File

@@ -64,7 +64,7 @@ do_compile:append:am65xx-hs-evm() {
optee_sign_k3hs
}
do_compile:append:am64xx-hs-evm() {
do_compile:append:am64xx-evm() {
optee_sign_k3hs
}