From 98721c52da7282859becd02da0c122477598c28c Mon Sep 17 00:00:00 2001 From: Chirag Shilwant Date: Mon, 20 Mar 2023 04:12:09 +0000 Subject: am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Lets add the basic AM62x LP HS-FS configuration - Add machine conf for AM62x LP HS-FS. - The wic images will boot on AM62x LP HS-FS devices by default. - The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. - Add ti-sci-firmware overrides. Signed-off-by: Chirag Shilwant Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++ meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 7 ++++++- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..9026b67c --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx LPSK HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP 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_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf index 11e70342..c126de0f 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf @@ -11,4 +11,11 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index df113003..d37d4673 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc @@ -8,8 +8,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62x LP is for HS-SE +# Default tiboot3.bin on AM62x LP 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 LP 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" TFA_BOARD = "lite" 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 8004c227..75b9f8a6 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 @@ -42,6 +42,7 @@ 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_am62xx-lp-evm-k3r5-hs-fs = "fs" SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" -- cgit v1.2.3-54-g00ecf