Skip to contentSkip to conversation

u-boot-k3-r5: remove unused gen_x509_cert.sh

PATCH New Denys Dmytriyenko 1 participant 9 messages May 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 u-boot-k3-r5: remove unused gen_x509_cert.sh

---
 .../u-boot/u-boot-k3-r5/gen_x509_cert.sh           | 311 ---------------------
 1 file changed, 311 deletions(-)
 delete mode 100755 meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5/gen_x509_cert.sh
meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5/gen_x509_cert.sh deleted +0 -311
deleted file mode 100755
index 82d6042..0000000
@@ -1,311 +0,0 @@
-#!/bin/bash
-#
-# Script to add x509 certificate to binary/ELF
-
-# Variables
-VALID_SHAS="sha256 sha384 sha512 sha224"
-OUTPUT=x509-firmware.bin
-TEMP_X509=x509-temp.cert
-CERT=certificate.bin
-RAND_KEY=eckey.pem
-VALID_ROM_CORES="r5 m3"
-VALID_DMSC_CORES="r5-00 r5-01 a53-00 a53-01 a53-10 a53-11"
-SHA=sha512
-CORE=m3
-LOADADDR=0x00040000
-VALID_MASTERS="rom dmsc"
-
-declare -A sha_oids
-sha_oids["sha256"]=2.16.840.1.101.3.4.2.1
-sha_oids["sha384"]=2.16.840.1.101.3.4.2.2
-sha_oids["sha512"]=2.16.840.1.101.3.4.2.3
-sha_oids["sha224"]=2.16.840.1.101.3.4.2.4
-
-declare -A core_ids
-core_ids["a53-00"]=0x20
-core_ids["a53-01"]=0x21
-core_ids["a53-10"]=0x22
-core_ids["a53-11"]=0x23
-core_ids["r5-00"]=0x01
-core_ids["r5-01"]=0x02
-
-gen_key() {
-	openssl ecparam -out $RAND_KEY -name prime256v1 -genkey
-	KEY=$RAND_KEY
-}
-
-declare -A options_help
-usage() {
-	if [ -n "$*" ]; then
-		echo "ERROR: $*"
-	fi
-	echo -n "Usage: $0 "
-	for option in "${!options_help[@]}"
-	do
-		arg=`echo ${options_help[$option]}|cut -d ':' -f1`
-		if [ -n "$arg" ]; then
-			arg=" $arg"
-		fi
-		echo -n "[-$option$arg] "
-	done
-	echo
-	echo -e "\nWhere:"
-	for option in "${!options_help[@]}"
-	do
-		arg=`echo ${options_help[$option]}|cut -d ':' -f1`
-		txt=`echo ${options_help[$option]}|cut -d ':' -f2`
-		tb="\t\t\t"
-		if [ -n "$arg" ]; then
-			arg=" $arg"
-			tb="\t"
-		fi
-		echo -e "   -$option$arg:$tb$txt"
-	done
-	echo
-	echo "Examples of usage:-"
-	echo "# Generate x509 certificate with random key from elf"
-	echo "    CROSS_COMPILE=arm-linux-gnueabihf- $0 -b ti-sci-firmware-am6x.elf -o dmsc.bin -l 0x40000"
-	echo "# Generate x509 certificate with random key from bin"
-	echo "    $0 -b ti-sci-firmware-am6x.bin -o dmsc.bin -l 0x40000"
-	echo "# Example of signing the DMSC binary"
-	echo "    $0 -m rom -c m3 -b ti-sci-firmware-am6x.bin -o dmsc.bin -l 0x40000"
-	echo "# Example of signing the SPL binary"
-	echo "    $0 -m rom -c r5 -b spl/u-boot-spl.bin -o tiboot3.bin -l 0x41c00000"
-	echo "# Example of signing the ATF binary to run on A53"
-	echo "    $0 -m dmsc -c a53-00 -b bl31.bin -o atf.bin -l 0x70000000"
-}
-
-options_help[e]="elf_file:ELF file that needs to be signed"
-options_help[b]="bin_file:Bin file that needs to be signed"
-options_help[k]="key_file:file with key inside it. If not provided script generates a random key."
-options_help[o]="output_file:Name of the final output file. default x509-firmware.bin"
-options_help[c]="core:target core on which the image would be running. Default is m3. Valid option for rom are $VALID_ROM_CORES. Valid options for DMSC are $VALID_DMSC_CORES"
-options_help[d]=":Countersign DMSC firmware image. This signs a previously signed image for a second time."
-options_help[s]="sha_type:sha type to be used for certificate generation. Default is sha512. Valid option are $VALID_SHAS"
-options_help[l]="loadaddr: Target load address of the binary in hex. Default to $LOADADDR"
-options_help[m]="master: Master name for which the image is created. This master software parses the certificate and load the images accordingly. Default to rom. valid options are $VALID_MASTERS"
-
-while getopts "e:b:k:o:c:ds:l:m:h" opt
-do
-	case $opt in
-	e)
-		ELF=$OPTARG
-	;;
-	b)
-		BIN=$OPTARG
-	;;
-	k)
-		KEY=$OPTARG
-	;;
-	o)
-		OUTPUT=$OPTARG
-	;;
-	l)
-		LOADADDR=$OPTARG
-	;;
-	s)
-		SHA=$OPTARG
-		sha_valid=0
-		for tsha in $VALID_SHAS
-		do
-			if [ "$tsha" == "$SHA" ]; then
-				sha_valid=1
-			fi
-		done
-		if [ $sha_valid == 0 ]; then
-			usage "Invalid sha input $SHA"
-			exit 1
-		fi
-	;;
-	c)
-		CORE=$OPTARG
-	;;
-	d)
-		CERTTYPE=3	# CERT_TYPE_FIRMWARE_COUNTERSIGN
-	;;
-	m)
-		MASTER=$OPTARG
-		master_valid=0
-		for vmaster in $VALID_MASTERS
-		do
-			if [ "$vmaster" == "$MASTER" ]; then
-				master_valid=1
-			fi
-		done
-		if [ $master_valid == 0 ]; then
-			usage "Invalid master input $MASTER"
-			exit 1
-		fi
-	;;
-	h)
-		usage
-		exit 0
-	;;
-	\?)
-		usage "Invalid Option '-$OPTARG'"
-		exit 1
-	;;
-	:)
-		usage "Option '-$OPTARG' Needs an argument."
-		exit 1
-	;;
-	esac
-done
-
-if [ "$#" -eq 0 ]
-then
-	usage "Arguments missing"
-	exit 1
-fi
-
-if [ -z "$BIN" -a -z "$ELF" ]; then
-	usage "Either Input bin file or ELF file to sign"
-	exit 1
-fi
-
-if [ "$MASTER" == "dmsc" ]; then
-	VALID_CORES=$VALID_DMSC_CORES
-else
-	# Defaut to ROM image
-	VALID_CORES=$VALID_ROM_CORES
-	MASTER="rom"
-fi
-
-# Verify for valid core inputs
-core_valid=0
-for tcore in $VALID_CORES
-do
-	if [ "$tcore" == "$CORE" ]; then
-		core_valid=1
-	fi
-done
-if [ $core_valid == 0 ]; then
-	usage "Invalid target core $CORE"
-	exit 1
-fi
-
-# Generate random key if user doesn't provide a key
-if [ -z "$KEY" ]; then
-	gen_key
-fi
-
-if [ "$MASTER" == "dmsc" ]; then
-	BOOTCORE=${core_ids["$CORE"]}
-	BOOTCORE_OPTS_VER=$(printf "%01x" 1)
-	# Add input args option for SET and CLR flags.
-	BOOTCORE_OPTS_SETFLAG=$(printf "%08x" 0)
-	BOOTCORE_OPTS_CLRFLAG=$(printf "%08x" 0x100) # Clear FLAG_ARMV8_AARCH32
-	BOOTCORE_OPTS="0x$BOOTCORE_OPTS_VER$BOOTCORE_OPTS_SETFLAG$BOOTCORE_OPTS_CLRFLAG"
-	# Set the cert type to zero.
-	# We are not using public/private key store now
-	CERTTYPE=$(printf "0x%08x" 0)
-else
-	if [ "$CORE" == "m3" ]; then
-		if [ -z "$CERTTYPE" ]; then
-			CERTTYPE=2	# CERT_TYPE_FIRMWARE_IMAGE_BIN
-		fi
-		BOOTCORE=0		# DMSC Controller (M3)
-		BOOTCORE_OPTS=32
-	else
-		CERTTYPE=1		# CERT_TYPE_PRIMARY_IMAGE_BIN
-		BOOTCORE=16		# MCU (R5)
-		BOOTCORE_OPTS=32
-	fi
-fi
-
-if [ -z "$BIN" ]; then
-	echo "Generating bin from elf $ELF"
-	BIN=firmware.bin
-	${CROSS_COMPILE}objcopy -g -S --gap-fill 0x0 -O binary $ELF $BIN
-	if [ "$?" != "0" ]; then
-		echo "ERROR: Generating bin from $ELF failed. CROSS_COMPILE?"
-		exit 1
-	fi
-fi
-
-SHA_OID=${sha_oids["$SHA"]}
-SHA_VAL=`openssl dgst -$SHA -hex $BIN | sed -e "s/^.*= //g"`
-BIN_SIZE=`cat $BIN | wc -c`
-ADDR=`printf "%08x" $LOADADDR`
-
-# Generate x509 Template
-gen_template() {
-cat << 'EOF' > x509-template.txt
- [ req ]
- distinguished_name     = req_distinguished_name
- x509_extensions        = v3_ca
- prompt                 = no
- dirstring_type         = nobmp
-
- [ req_distinguished_name ]
- C                      = US
- ST                     = SC
- L                      = New York
- O                      = Texas Instruments., Inc.
- OU                     = DSP
- CN                     = Albert
- emailAddress           = [email protected]
-
- [ v3_ca ]
- basicConstraints = CA:true
- 1.3.6.1.4.1.294.1.1 = ASN1:SEQUENCE:boot_seq
- 1.3.6.1.4.1.294.1.2 = ASN1:SEQUENCE:image_integrity
- 1.3.6.1.4.1.294.1.3 = ASN1:SEQUENCE:swrv
-# 1.3.6.1.4.1.294.1.4 = ASN1:SEQUENCE:encryption
- 1.3.6.1.4.1.294.1.8 = ASN1:SEQUENCE:debug
-
- [ boot_seq ]
- certType = INTEGER:TEST_CERT_TYPE
- bootCore = INTEGER:TEST_BOOT_CORE
- bootCoreOpts = INTEGER:TEST_BOOT_CORE_OPTS
- destAddr = FORMAT:HEX,OCT:TEST_BOOT_ADDR
- imageSize = INTEGER:TEST_IMAGE_LENGTH
-
- [ image_integrity ]
- shaType = OID:TEST_IMAGE_SHA_OID
- shaValue = FORMAT:HEX,OCT:TEST_IMAGE_SHA_VAL
-
- [ swrv ]
- swrv = INTEGER:0
-
-# [ encryption ]
-# initalVector = FORMAT:HEX,OCT:TEST_IMAGE_ENC_IV
-# randomString = FORMAT:HEX,OCT:TEST_IMAGE_ENC_RS
-# iterationCnt = INTEGER:TEST_IMAGE_KEY_DERIVE_INDEX
-# salt = FORMAT:HEX,OCT:TEST_IMAGE_KEY_DERIVE_SALT
-
- [ debug ]
- debugUID = FORMAT:HEX,OCT:0000000000000000000000000000000000000000000000000000000000000000
- debugType = INTEGER:4
- coreDbgEn = INTEGER:0
- coreDbgSecEn = INTEGER:0
-EOF
-}
-
-gen_cert() {
-	echo "Certificate being generated :"
-	echo "	LOADADDR = 0x$ADDR"
-	echo "	IMAGE_SIZE = $BIN_SIZE"
-	echo "	CERT_TYPE = $CERTTYPE"
-	sed -e "s/TEST_IMAGE_LENGTH/$BIN_SIZE/"	\
-		-e "s/TEST_IMAGE_SHA_OID/$SHA_OID/" \
-		-e "s/TEST_IMAGE_SHA_VAL/$SHA_VAL/" \
-		-e "s/TEST_CERT_TYPE/$CERTTYPE/" \
-		-e "s/TEST_BOOT_CORE_OPTS/$BOOTCORE_OPTS/" \
-		-e "s/TEST_BOOT_CORE/$BOOTCORE/" \
-		-e "s/TEST_BOOT_ADDR/$ADDR/" x509-template.txt > $TEMP_X509
-	openssl req -new -x509 -key $KEY -nodes -outform DER -out $CERT -config $TEMP_X509 -$SHA
-}
-
-gen_template
-gen_cert
-cat $CERT $BIN > $OUTPUT
-
-echo "SUCCESS: Image $OUTPUT generated."
-
-# Remove all intermediate files
-rm $TEMP_X509 $CERT x509-template.txt
-if [ "$KEY" == "$RAND_KEY" ]; then
-	rm $RAND_KEY
-fi
-
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/9 arago-core-tisdk-image: use am65xx SOC family for DTB_FILTER

---
 meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc +1 -1
index da5d44d..e69f8c2 100644
@@ -28,7 +28,7 @@ DTB_FILTER_k2l = "k2l"
 DTB_FILTER_k2e = "k2e"
 DTB_FILTER_k2g = "k2g"
 DTB_FILTER_omapl138 = "da850"
-DTB_FILTER_am65xx-evm = "am65"
+DTB_FILTER_am65xx = "am65"
 
 # List of target side images to build for the SDK
 TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image"
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/9 arago-core-tisdk-image: make SYSFW GP image specific to am65xx-evm

In reply to Denys Dmytriyenko
---
 meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-arago-distro/recipes-core/images/arago-core-tisdk-image.bb +2 -1
index 529d9de..263c265 100644
@@ -8,7 +8,8 @@ DEPLOY_SPL_NAME_k2e = ""
 DEPLOY_SPL_NAME_k2g-hs-evm = ""
 DEPLOY_SPL_NAME_k3 = "tispl.bin tiboot3.bin"
 
-DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb ti-sci-firmware-am65x-gp.bin"
+DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb"
+DEPLOY_IMAGES_NAME_append_am65xx-evm = " ti-sci-firmware-am65x-gp.bin"
 
 ARAGO_TISDK_IMAGE ?= "arago-core-tisdk-image"
 export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/9 u-boot-k3-r5: specify config for am65xx HS

In reply to Denys Dmytriyenko
---
 meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb | 1 +
 1 file changed, 1 insertion(+)
meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb +1 -0
index cb10ebc..fae3d62 100644
@@ -12,6 +12,7 @@ CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${EAT_TARGET_SYS_ARMV7}-'][d.getVar('T
 PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
 
 UBOOT_MACHINE_am65xx-evm = "am65x_evm_r5_defconfig"
+UBOOT_MACHINE_am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
 
 EXTRA_OEMAKE = 'ARCH=arm CROSS_COMPILE=${CROSS_COMPILE_V7} CC="${CROSS_COMPILE_V7}gcc ${TOOLCHAIN_OPTIONS}" V=1'
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/9 optee-os: sign binary image for am65xx HS

In reply to Denys Dmytriyenko
---
 meta-arago-distro/recipes-security/optee/optee-os_git.bbappend | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta-arago-distro/recipes-security/optee/optee-os_git.bbappend +10 -0
index dd6c9c6..b81b51f 100644
@@ -65,6 +65,16 @@ do_compile_aarch64() {
     )
 }
 
+do_compile_am65xx-hs-evm() {
+    export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+    oe_runmake all PLATFORM=${OPTEEMACHINE} PLATFORM_FLAVOR=${OPTEEFLAVOR}
+    ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
+        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager.bin tee-pager.bin.signed; \
+        mv tee-pager.bin.signed ${B}/bl32.bin; \
+        cp tee.elf ${B}/bl32.elf; \
+    )
+}
+
 do_install() {
     #install core on boot directory
     install -d ${D}/boot
Signature · 1 line
2.7.4
#5 lore raw

PATCH 6/9 ti-sci-fw: add support for am65xx-hs-evm

In reply to Denys Dmytriyenko

This uses HS SYSFW images that have to be pre-downloaded for now.

---
 .../recipes-bsp/ti-sci-fw/ti-sci-fw_2019.04a.bb    | 33 +++++++++++++++++-----
 1 file changed, 26 insertions(+), 7 deletions(-)
meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.04a.bb +26 -7
index 0519b56..60e1589 100644
@@ -11,31 +11,50 @@ COMPATIBLE_MACHINE = "k3"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+TI_SECURE_DEV_PKG ?= ""
+export TI_SECURE_DEV_PKG
+
 SRCREV = "b41c4f097ab6f341462645f76059f48f78bbd17e"
 
 BRANCH ?= "ti-linux-firmware"
 
+SRCREV_imggen = "f68fe913c16f13a7e04f6f340de1c4f6cc561c10"
+SRCREV_FORMAT = "imggen"
+
 SRC_URI = " \
 	git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \
 	git://git.ti.com/processor-firmware/system-firmware-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \
 "
 
-SRCREV_imggen = "f68fe913c16f13a7e04f6f340de1c4f6cc561c10"
-SRCREV_FORMAT = "imggen"
+# Please note, "install.source.dir.local" is not a real URL, files need to be pre-downloaded
+SRC_URI_append_am65xx-hs-evm = " \
+	http://install.source.dir.local/ti-sci-firmware-am65x-hs-cert.bin;name=hs-cert \
+	http://install.source.dir.local/ti-sci-firmware-am65x-hs-enc.bin;name=hs-enc \
+"
+
+SRC_URI[hs-cert.md5sum] = "9c4de5577d92c83a467dad36ef04691b"
+SRC_URI[hs-cert.sha256sum] = "262d4e4edc8eca996caaeefeb3d5daffe11d45d9499c6f71ad1a6a2fcf68aa97"
+SRC_URI[hs-enc.md5sum] = "c851061ec96db61b601ad3685b1ecd23"
+SRC_URI[hs-enc.sha256sum] = "73a17fd6ee2770d12ba328dd64009572b9ab0fbd4989111b34a7d67c5dfd2ca8"
 
 S = "${WORKDIR}/git"
 
-SYSFW_TISCI_am65xx-evm = "ti-sci-firmware-am65x-gp.bin"
+SYSFW_TISCI_am65xx-evm = "${S}/ti-sysfw/ti-sci-firmware-am65x-gp.bin"
+SYSFW_TISCI_am65xx-hs-evm = "${WORKDIR}/ti-sci-firmware-am65x-hs-*.bin"
 SYSFW_BINARY = "sysfw.itb"
 SYSFW_IMAGE = "sysfw-${PV}.itb"
 
-CROSS_COMPILE_V7 = "${ELT_TARGET_SYS_ARMV7}-"
+CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${ELT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'linaro']}"
+CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${EAT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'arm']}"
 PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
 
+EXTRA_OEMAKE = "CROSS_COMPILE=${CROSS_COMPILE_V7} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL=''"
+EXTRA_OEMAKE_append_am65xx-hs-evm = " HS=1"
+
 do_compile() {
-	cp ${S}/ti-sysfw/${SYSFW_TISCI} ${WORKDIR}/imggen/
+	cp ${SYSFW_TISCI} ${WORKDIR}/imggen/
 	cd ${WORKDIR}/imggen/
-	oe_runmake SYSFW_DL_URL=""
+	oe_runmake
 }
 
 do_install() {
@@ -54,7 +73,7 @@ do_deploy () {
 	rm -f ${DEPLOYDIR}/${SYSFW_BINARY}
 	ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_BINARY}
 
-        install -m 644 ${S}/ti-sysfw/${SYSFW_TISCI} ${DEPLOYDIR}/${SYSFW_TISCI}
+	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
 
 addtask deploy before do_build after do_compile
Signature · 1 line
2.7.4
#6 lore raw

PATCH 7/9 kernel-fitimage: sync up with upstream

In reply to Denys Dmytriyenko

Pull in fixes for sanitizing dtb section names and fixing image type replacement for aarch64 from oe-core.

---
 meta-arago-distro/classes/kernel-fitimage.bbclass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
meta-arago-distro/classes/kernel-fitimage.bbclass +10 -2
index a3b85ad..9aa7640 100644
@@ -16,8 +16,15 @@ python __anonymous () {
         depends = "%s u-boot-mkimage-native dtc-native" % depends
         d.setVar("DEPENDS", depends)
 
-        if d.getVar("UBOOT_ARCH") == "x86":
+        uarch = d.getVar("UBOOT_ARCH")
+        if uarch == "arm64":
+            replacementtype = "Image"
+        elif uarch == "mips":
+            replacementtype = "vmlinuz.bin"
+        elif uarch == "x86":
             replacementtype = "bzImage"
+        elif uarch == "microblaze":
+            replacementtype = "linux.bin"
         else:
             replacementtype = "zImage"
 
@@ -334,7 +341,7 @@ fitimage_emit_section_config() {
 
 	dtbcount=1
 	for DTB in ${KERNEL_DEVICETREE}; do
-
+		DTB=$(echo "${DTB}" | tr '/' '_')
 		if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
 			conf_name="${DTB}"
 		else
@@ -506,6 +513,7 @@ fitimage_assemble() {
 			if [ ! -e "${DTB_PATH}" ]; then
 				DTB_PATH="arch/${ARCH}/boot/${DTB}"
 			fi
+			DTB=$(echo "${DTB}" | tr '/' '_')
 			fitimage_ti_secure ${DTB_PATH} ${DTB_PATH}.sec
 			if [ "x${FITIMAGE_DTB_BY_NAME}" = "x1" ] ; then
 				fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}.sec
Signature · 1 line
2.7.4
#7 lore raw

PATCH 8/9 kernel-fitimage, arago.conf: introduce FITIMAGE_PACK_TEE

In reply to Denys Dmytriyenko

Instead of relying on OPTEEMACHINE and OPTEEFLAVOR, use FITIMAGE_PACK_TEE to specify if packing OPTEE into FIT is required.

---
 meta-arago-distro/classes/kernel-fitimage.bbclass | 7 ++++---
 meta-arago-distro/conf/distro/arago.conf          | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)
meta-arago-distro/classes/kernel-fitimage.bbclass +4 -3
index 9aa7640..34b61d0 100644
@@ -1,6 +1,7 @@
 inherit kernel-uboot uboot-sign
 
 FITIMAGE_HASH_ALGO ?= "sha1"
+FITIMAGE_PACK_TEE ?= "0"
 FITIMAGE_DTB_BY_NAME ?= "0"
 FITIMAGE_TEE_BY_NAME ?= "0"
 FITIMAGE_CONF_BY_NAME ?= "0"
@@ -46,7 +47,7 @@ python __anonymous () {
             uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
             d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn)
 
-        if d.getVar('OPTEEMACHINE'):
+        if d.getVar('FITIMAGE_PACK_TEE') == "1":
             d.appendVarFlag('do_assemble_fitimage', 'depends', ' optee-os:do_deploy')
 }
 
@@ -323,7 +324,7 @@ fitimage_emit_section_config() {
 		setup_line="setup = \"setup@${5}\";"
 	fi
 
-	if [ -n "${6}" -a -n "${OPTEEFLAVOR}" ]; then
+	if [ -n "${6}" -a "x${FITIMAGE_PACK_TEE}" = "x1" ]; then
 		if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ]; then
 			loadables_line="loadables = \"${6}.optee\";"
 			loadables_pager_line="loadables = \"${6}-pager.optee\";"
@@ -530,7 +531,7 @@ fitimage_assemble() {
 	#
 	# Step 2a: Prepare OP/TEE image section
 	#
-	if test -n "${OPTEEFLAVOR}"; then
+	if [ "x${FITIMAGE_PACK_TEE}" = "x1" ] ; then
 		mkdir -p ${B}/usr
 		rm -f ${B}/usr/${OPTEEFLAVOR}.optee
 		if [ -e "${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}.optee" ]; then
meta-arago-distro/conf/distro/arago.conf +2 -0
index 7129202..1a8263d 100644
@@ -38,6 +38,8 @@ IMAGE_FSTYPES += "tar.xz.md5"
 # FIT image for secure devices
 KERNEL_CLASSES += "kernel-fitimage"
 FITIMAGE_HASH_ALGO = ""
+FITIMAGE_PACK_TEE = "1"
+FITIMAGE_PACK_TEE_am65xx-hs-evm = "0"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
Signature · 1 line
2.7.4
#8 lore raw

PATCH 9/9 arago.conf: enable FIT image generation for am65xx-hs-evm

In reply to Denys Dmytriyenko
---
 meta-arago-distro/conf/distro/arago.conf | 1 +
 1 file changed, 1 insertion(+)
meta-arago-distro/conf/distro/arago.conf +1 -0
index 1a8263d..ee2080f 100644
@@ -48,6 +48,7 @@ KERNEL_IMAGETYPES_dra7xx-hs-evm = "zImage fitImage"
 KERNEL_IMAGETYPES_am57xx-hs-evm = "zImage fitImage"
 KERNEL_IMAGETYPES_am437x-hs-evm = "zImage fitImage"
 KERNEL_IMAGETYPES_am335x-hs-evm = "zImage fitImage"
+KERNEL_IMAGETYPES_am65xx-hs-evm = "Image fitImage"
 
 KERNEL_IMAGETYPES_k2e-hs-evm = "zImage fitImage"
 INITRAMFS_IMAGE_k2e-hs-evm = "k2-fw-initrd"
Signature · 1 line
2.7.4