From e6deeba806d2145fa16b0b5f444f2985e63e6366 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 8 Aug 2022 11:32:02 -0500 Subject: [PATCH 1/2] conf: machine: k3: Add fitImage to the default kernel image types FIT Image based kernels are valid for all K3 devices, not just HS, deploy this kernel image type by default so it doesn't have to be appended on a per-device-type basis. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- conf/machine/include/k3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index a5f96087..8109cd02 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image vmlinux.gz" +KERNEL_IMAGETYPES = "Image vmlinux.gz fitImage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" From 0b7429595e60079e13d92ecd8372392a2178acf2 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 8 Aug 2022 20:05:04 -0500 Subject: [PATCH 2/2] ti-sci-fw: Add am65xx-evm-k3r5-sr2 to combined R5 boot list This machine was missed when making combined R5 boot the default. Add this machine to fix build failure. Reported-by: Ryan Eatmon Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 841fe16a..18652dd4 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -2,6 +2,7 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" DEPENDS_remove_am65xx-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_am65xx-evm-k3r5-sr2 = " virtual/bootloader" DEPENDS_remove_am65xx-hs-evm-k3r5 = " virtual/bootloader" DEPENDS_remove_am65xx-hs-evm-k3r5-sr2 = " virtual/bootloader" DEPENDS_remove_j7-evm-k3r5 = " virtual/bootloader" @@ -57,6 +58,7 @@ EXTRA_OEMAKE = "\ SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ " EXTRA_OEMAKE_remove_am65xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" EXTRA_OEMAKE_remove_j7-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""