bb: add command to submit ifcp loader [3/3]

PD#SWPL-159130 Problem: After suspend secpu is put under reset Solution: Install TA to system Verify: S1A Change-Id: I578923ea09c8bb198cdadab54712ce55732ee404 Signed-off-by: Matthew Shyu <[email protected]>
khadas · May 27, 2024 · 4ef8c8d · 4ef8c8d
1 parent 917d904
commit 4ef8c8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/recipes-bsp/u-boot/u-boot_2023.01.bb b/recipes-bsp/u-boot/u-boot_2023.01.bb
@@ -95,11 +95,10 @@ IRDETO_UBOOT_PATH:bf201 = "s805c1a/Yocto"
 IRDETO_UBOOT_PATH:bg201 = "s805c1/Yocto"
 IRDETO_UBOOT_PATH:bg209 = "s805c1/Yocto"
 IRDETO_BL2e_ARG="--bl2e irdeto-sdk/bootloader/${IRDETO_UBOOT_PATH}/bl2/blob-bl2e.sto.bin.signed"
-IRDETO_BL32_ARG="--bl32 irdeto-sdk/bootloader/${IRDETO_UBOOT_PATH}/bl32/blob-bl32.bin.signed"
+IRDETO_BL32_ARG="${@bb.utils.contains('DISTRO_FEATURES', 'nand', '--bl32 irdeto-sdk/bootloader/${IRDETO_UBOOT_PATH}/bl32/blob-bl32.nand.bin.signed', '--bl32 irdeto-sdk/bootloader/${IRDETO_UBOOT_PATH}/bl32/blob-bl32.bin.signed', d)}"
 IRDETO_BL40_ARG="--bl40 irdeto-sdk/bootloader/${IRDETO_UBOOT_PATH}/bl40/blob-bl40.bin.signed"
 IRDETO_LOADER_ARG="--disable-bl33z"
 IRDETO_UBOOT_ARG = " ${@bb.utils.contains('DISTRO_FEATURES', 'irdeto', '${IRDETO_BL2e_ARG} ${IRDETO_BL32_ARG} ${IRDETO_BL40_ARG}', '', d)}"
-IRDETO_UBOOT_ARG:remove:s1a = " ${@bb.utils.contains('DISTRO_FEATURES', 'irdeto-ree-only', '${IRDETO_BL32_ARG}', '', d)}"
 IRDETO_UBOOT_ARG:append:s1a = " ${@bb.utils.contains('DISTRO_FEATURES', 'irdeto-downloader', '${IRDETO_LOADER_ARG}', '', d)}"
 CFLAGS +=" -DCONFIG_YOCTO "
 KCFLAGS +=" -DCONFIG_YOCTO "

diff --git a/recipes-cas/irdeto/irdeto-sdk.bb b/recipes-cas/irdeto/irdeto-sdk.bb
@@ -4,6 +4,7 @@ LICENSE = "CLOSE"
 PV = "git${SRCPV}"
 PR = "r0"
 
+DEPENDS += "liblog optee-userspace"
 #Only enable it in OpenLinux
 #IRDETO_BRANCH = "TBD"
 #IRDETO_BRANCH:sc2 = "openlinux/sc2-msr4-linux"
@@ -24,6 +25,9 @@ IRDETO_PATH:aq2432 = "s805c3"
 IRDETO_PATH:bf201 = "s805c1a"
 IRDETO_PATH:bg201 = "s805c1"
 
+SOC_FAMILY = "TBD"
+SOC_FAMILY:s1a = "s1a"
+
 REE_ONLY = "${@bb.utils.contains('DISTRO_FEATURES', 'irdeto-ree-only', 'true', 'false', d)}"
 
 EXTRA_OEMAKE = "STAGING_DIR=${STAGING_DIR_TARGET} TARGET_DIR=${D} \
@@ -57,6 +61,11 @@ do_install() {
         install -d -m 0755 ${D}/usr/lib
         install -D -m 0644 ${S}/lib/ca/libirdetoca.so ${D}/usr/lib
     fi
+
+    if [ "${SOC_FAMILY}" = "s1a" ]; then
+        install -D -m 0644 ${S}/lib/ta/${IRDETO_PATH}/6fbf7114-81e9-456f-8a62-b8da52da467d.ta ${D}/lib/optee_armtz
+    fi
+
     install -D -m 0644 ${S}/include/*.h ${D}/usr/include
 }