ls1043ardb: update machine config

*update UBOOT_CONFIG

*add UEFI_NORBOOT,RCWNOR,RCWSD and RCWNAND var

*remove ppa

*add atf to EXTRA_IMAGEDEPEND

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index d6e4f59c8..f9b0d3d98 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -16,21 +16,18 @@ KERNEL_IMAGETYPES = "fitImage"
 UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
-UBOOT_CONFIG ??= "nand sdcard secure-boot nand-dtb-secure-boot nand-spl-secure-boot nand-secure-boot sdcard-dtb-secure-boot sdcard-spl-secure-boot sdcard-secure-boot nor"
-UBOOT_CONFIG[nor] = "ls1043ardb_config,,u-boot-dtb.bin"
-UBOOT_CONFIG[nand] = "ls1043ardb_nand_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard] = "ls1043ardb_sdcard_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[secure-boot] = "ls1043ardb_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[nand-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[nand-spl-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin"
-UBOOT_CONFIG[nand-dtb-secure-boot] = "ls1043ardb_nand_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[sdcard-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin"
-UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1043ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG ??= "tfa-secure-boot tfa"
+UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
+UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd"
+RCWNOR ?= "RR_FQPP_1455/rcw_1600.bin"
+RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot.bin"
+RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot.bin"
+
 QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin"
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa ppa-optee qe-ucode uefi"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf"
 USE_VT = "0"