From: Chirag Shilwant <[email protected]> Lets add the basic AM62x HS-FS configuration - Add machine conf for AM62x HS-FS. - The wic images will boot on AM62x HS-FS devices by default. - The sysfw image for GP and HS-SE will be packaged in the wic image as tiboot3-am62x-gp-evm.bin and tiboot3-am62x-hs-evm.bin respectively. - Add ti-sci-firmware overrides.
Signed-off-by: Chirag Shilwant <[email protected]> Signed-off-by: Ryan Eatmon <[email protected]> Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf | 4 ++++ .../conf/machine/am62xx-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ meta-ti-bsp/conf/machine/include/am62xx.inc | 12 +++++++++--- meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf | 3 +++ meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf index d9867bc7..ab18301a 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf @@ -8,7 +8,11 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "" + UBOOT_MACHINE = "am62x_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/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..0dad1104 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 53e48610..af6a6db4 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -8,10 +8,16 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -BBMULTICONFIG = "k3r5-gp" -do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" +# Default tiboot3.bin on AM62x is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" -# Since default tiboot3.bin on AM62x is for GP, add a version for HS-SE +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf new file mode 100644 index 00000000..e22204ee --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 798131d4..8004c227 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -39,6 +39,7 @@ SYSFW_PREFIX:j784s4-evm-k3r5 = "fs" SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs" SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" +SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs" SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16178): https://lists.yoctoproject.org/g/meta-ti/message/16178 Mute This Topic: https://lists.yoctoproject.org/mt/97728659/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
