From 6a84033ecdaf8460485ce6d5bb5c7e31615784fe Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Fri, 21 Apr 2023 18:00:55 +0000 Subject: [PATCH] base/bsp: change atf support Signed-off-by: Jose Quaresma --- meta-lmp-base/classes/uboot-fitimage.bbclass | 2 +- .../conf/machine/include/lmp-machine-custom.inc | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-lmp-base/classes/uboot-fitimage.bbclass b/meta-lmp-base/classes/uboot-fitimage.bbclass index d4e52bc6e8..3b24458a82 100644 --- a/meta-lmp-base/classes/uboot-fitimage.bbclass +++ b/meta-lmp-base/classes/uboot-fitimage.bbclass @@ -26,7 +26,7 @@ FIT_HASH_ALG ?= "sha256" OPTEE_BINARY ?= "tee-pager_v2.bin" OPTEE_SUPPORT = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" ATF_BINARY ?= "arm-trusted-firmware.bin" -ATF_SUPPORT = "${@bb.utils.contains('EXTRA_IMAGEDEPENDS', 'virtual/trusted-firmware-a', 'true', 'false', d)}" +ATF_SUPPORT ?= "false" BOOTSCR_SUPPORT = "${@bb.utils.contains('PREFERRED_PROVIDER_u-boot-default-script', 'u-boot-ostree-scr-fit', 'true', 'false', d)}" # FPGA loading via SPL SPL_FPGA_BINARY ?= "" diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc index 70e589dc69..7a303d3ada 100644 --- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc +++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc @@ -267,7 +267,7 @@ PREFERRED_PROVIDER_u-boot-default-script:sota:mx8qm-generic-bsp = "u-boot-ostree UBOOT_CLASSES:mx8qm-generic-bsp = "uboot-fitimage" IMXBOOT_TARGETS:mx8qm-nxp-bsp = "flash_evk_spl" ATF_BINARY:mx8qm-generic-bsp = "arm-trusted-firmware.bin" -EXTRA_IMAGEDEPENDS:append:mx8qm-generic-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx8qm-generic-bsp = "true" UBOOT_ENTRYPOINT:mx8qm-generic-bsp = "0x80280000" UBOOT_LOADADDRESS:mx8qm-generic-bsp = "0x80280000" UBOOT_DTB_LOADADDRESS:mx8qm-generic-bsp = "0x83000000" @@ -296,7 +296,7 @@ UBOOT_DTB_LOADADDRESS:mx8ulp-generic-bsp = "0x83000000" UBOOT_CLASSES:mx8ulp-generic-bsp = "uboot-fitimage" IMXBOOT_TARGETS:mx8ulp-nxp-bsp ?= "flash_singleboot_spl_m33" ATF_BINARY:mx8ulp-generic-bsp = "arm-trusted-firmware.bin" -EXTRA_IMAGEDEPENDS:append:mx8ulp-generic-bsp = " virtual/trusted-firmware-a" +ATF_SUPPORT:mx8ulp-generic-bsp = "true" IMX_EXTRA_FIRMWARE:append:mx8ulp-nxp-bsp = " imx-m33-demos" KERNEL_IMAGETYPE:sota:mx8ulp-generic-bsp = "fitImage" KERNEL_CLASSES:sota:mx8ulp-generic-bsp = " kernel-lmp-fitimage " @@ -332,7 +332,7 @@ IMX_DEFAULT_BOOTLOADER:mx8mq-generic-bsp ?= "u-boot-fio" UBOOT_ENTRYPOINT:mx8mq-generic-bsp = "0x40400000" UBOOT_DTB_LOADADDRESS:mx8mq-generic-bsp = "0x43000000" PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mq-nxp-bsp ?= "imx-atf" -EXTRA_IMAGEDEPENDS:append:mx8mq-generic-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx8mq-generic-bsp = "true" UBOOT_CLASSES:mx8mq-generic-bsp = "uboot-fitimage" ATF_BINARY:mx8mq-generic-bsp = "arm-trusted-firmware.bin" UBOOT_CONFIG:mx8mq-generic-bsp = "" @@ -373,7 +373,7 @@ IMX_DEFAULT_BOOTLOADER:mx8mm-generic-bsp ?= "u-boot-fio" UBOOT_ENTRYPOINT:mx8mm-generic-bsp = "0x40400000" UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x43000000" PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mm-nxp-bsp ?= "imx-atf" -EXTRA_IMAGEDEPENDS:append:mx8mm-nxp-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx8mm-nxp-bsp = "true" UBOOT_CLASSES:mx8mm-generic-bsp = "uboot-fitimage" ATF_BINARY:mx8mm-generic-bsp = "arm-trusted-firmware.bin" UBOOT_CONFIG:mx8mm-generic-bsp = "" @@ -420,7 +420,7 @@ IMX_DEFAULT_BOOTLOADER:mx8mp-generic-bsp ?= "u-boot-fio" UBOOT_ENTRYPOINT:mx8mp-generic-bsp = "0x40400000" UBOOT_DTB_LOADADDRESS:mx8mp-generic-bsp = "0x43000000" PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mp-nxp-bsp ?= "imx-atf" -EXTRA_IMAGEDEPENDS:append:mx8mp-nxp-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx8mp-nxp-bsp = "true" UBOOT_CLASSES:mx8mp-generic-bsp = "uboot-fitimage" ATF_BINARY:mx8mp-generic-bsp = "arm-trusted-firmware.bin" UBOOT_CONFIG:mx8mp-generic-bsp = "" @@ -460,7 +460,7 @@ IMX_DEFAULT_BOOTLOADER:mx8mn-generic-bsp ?= "u-boot-fio" UBOOT_ENTRYPOINT:mx8mn-generic-bsp = "0x40400000" UBOOT_DTB_LOADADDRESS:mx8mn-generic-bsp = "0x43000000" PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx8mn-generic-bsp ?= "imx-atf" -EXTRA_IMAGEDEPENDS:append:mx8mn-generic-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx8mn-generic-bsp = "true" UBOOT_CLASSES:mx8mn-generic-bsp = "uboot-fitimage" ATF_BINARY:mx8mn-generic-bsp = "arm-trusted-firmware.bin" UBOOT_CONFIG:mx8mn-generic-bsp = "" @@ -506,7 +506,7 @@ PREFERRED_PROVIDER_virtual/trusted-firmware-a:mx93-nxp-bsp ?= "imx-atf" UBOOT_CLASSES:mx93-generic-bsp = "uboot-fitimage" IMXBOOT_TARGETS:mx93-nxp-bsp ?= "flash_singleboot_spl" ATF_BINARY:mx93-generic-bsp = "arm-trusted-firmware.bin" -EXTRA_IMAGEDEPENDS:append:mx93-generic-bsp = "virtual/trusted-firmware-a" +ATF_SUPPORT:mx93-generic-bsp = "true" KERNEL_IMAGETYPE:sota:mx93-generic-bsp = "fitImage" KERNEL_CLASSES:sota:mx93-generic-bsp = " kernel-lmp-fitimage " WKS_FILE:sota:mx93-generic-bsp = "emmc-imx-gpt-sota.wks"