From 65618b753f5baa71a6ca5a1c171b766a4404b58c Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Wed, 16 Dec 2020 17:48:04 +0000 Subject: [PATCH] arm-bsp/tc0: Enable verified u-boot This involes creating the fitImage which contains both the kernel and ramdisk. The fitImage is also signed. Signed-off-by: Usama Arif Change-Id: I2fc50740aac3e347be02438cf54ef5741183a670 Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/tc0.conf | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/meta-arm-bsp/conf/machine/tc0.conf b/meta-arm-bsp/conf/machine/tc0.conf index eed3acf4..6c366da6 100644 --- a/meta-arm-bsp/conf/machine/tc0.conf +++ b/meta-arm-bsp/conf/machine/tc0.conf @@ -11,18 +11,34 @@ require conf/machine/include/arm/arch-armv8a.inc # Das U-boot UBOOT_MACHINE ?= "total_compute_defconfig" PREFERRED_VERSION_u-boot ?= "2020.10" +UBOOT_RD_LOADADDRESS = "0x88000000" +UBOOT_RD_ENTRYPOINT = "0x88000000" +UBOOT_LOADADDRESS = "0x80080000" +UBOOT_ENTRYPOINT = "0x80080000" +# Below options will generate a key to sign the kernel Image and INITRAMFS_IMAGE +# according to the default parameters of kernel-fitimage.bbclass. If the user +# would prefer to use their own keys, disable the key generation using the +# FIT_GENERATE_KEYS parameter and specify the location of the keys using the +# below paramters. +UBOOT_SIGN_ENABLE = "1" +UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" +UBOOT_SIGN_KEYNAME = "dev_key" +UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys" +FIT_GENERATE_KEYS = "1" # Trusted firmware A v2.3 PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack" PREFERRED_VERSION_linux-arm64-ack ?= "5.4" # Cannot use the default zImage on arm64 KERNEL_IMAGETYPE = "Image" -KERNEL_BOOTCMD = "booti" -IMAGE_FSTYPES += "cpio.gz.u-boot" +KERNEL_IMAGETYPES += "fitImage" +KERNEL_CLASSES = " kernel-fitimage " + +IMAGE_FSTYPES += "cpio.gz" +INITRAMFS_IMAGE ?= "core-image-minimal" SERIAL_CONSOLES = "115200;ttyAMA0"