From c494a1839f7004109b9de8e533771ea74f0126c0 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Fri, 11 Jan 2019 03:14:44 +0000 Subject: [PATCH] ls1046ardb: update machine config *update UBOOT_CONFIG *add UEFI_NORBOOT,RCWQSPI and RCWSD var *remove ppa *add atf to EXTRA_IMAGEDEPENDS Signed-off-by: Chunrong Guo --- conf/machine/ls1046ardb.conf | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 84123131..83309c95 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -15,14 +15,9 @@ KERNEL_IMAGETYPES = "fitImage" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_CONFIG ??= "emmc sdcard sdcard-dtb-secure-boot sdcard-spl-secure-boot sdcard-secure-boot qspi-secure-boot qspi" -UBOOT_CONFIG[emmc] = "ls1046ardb_emmc_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard] = "ls1046ardb_sdcard_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[qspi] = "ls1046ardb_qspi_config,,u-boot-dtb.bin" -UBOOT_CONFIG[qspi-secure-boot] = "ls1046ardb_qspi_SECURE_BOOT_config,,u-boot-dtb.bin" -UBOOT_CONFIG[sdcard-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[sdcard-spl-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,spl/u-boot-spl.bin" -UBOOT_CONFIG[sdcard-dtb-secure-boot] = "ls1046ardb_sdcard_SECURE_BOOT_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG ??= "tfa-secure-boot tfa" +UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin" +UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin" KERNEL_DEVICETREE ?= "\ freescale/fsl-ls1046a-rdb-sdk.dtb \ @@ -33,5 +28,9 @@ KERNEL_DEFCONFIG ?= "defconfig" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyAMA0 115200;ttyLP0" SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" -EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa ppa-optee uefi" +UEFI_NORBOOT ?= "LS1046ARDB_EFI_NORBOOT.fd" +RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin" +RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.bin" + +EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf" USE_VT = "0" -- 2.40.1