From a1581156eb292b8939638878f23e5c49e3f903f8 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Mon, 14 Oct 2019 17:13:03 +0800 Subject: [PATCH] atf: update to 85e98b9 *update to lsdk 1909 tag include the following changes: 85e98b9 - nxp: errata: Enable workaround for Erratum A010539 with POLICY_OTA 8882a80 - ddr: phy: phy-gen2: optmial PHY settings 07d897c - plat: nxp: Add OTA support for Secure Boot 9fde61d - nand: fix for bad block management while nand read c4cbfcd - plat: nxp: ls1028a: Fix RDB reset issue durwing lpm20 exit 3502a08 - plat/nxp/nand: Add missing ONFI Device flag 7497445 - plat: nxp: ls1012afrwy_512mb: Add NXP_SD_BLOCK_BUF_SIZE definition 7f9026a - plat: nxp: ota: show OTA status clearly ccc6620 - LPM-20 support on ls1028ardb. fb76032 - moved the PMU Core & cluster mask from lsch3.h 15f9e0e - plat: nxp: Add OTA support with POLICY_OTA option 51c6363 - nxp: drivers: wdt: Add SP805 Watchdog support 3776f41 - nxp: drivers: wdt: Add Watchdog support 761ece9 - plat: nxp: soc-ls1012: Add NXP_SD_BLOCK_BUF_SIZE definition e77ebd1 - nxp/sd: Add write support for eSDHC 7132834 - plat/lx2: Add support for correct CCN configuration for LX2120 411ed2b - plat/lx2: Correct RNF node to cluster mapping *Add OTA support Signed-off-by: Chunrong Guo --- recipes-bsp/atf/atf_git.bb | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb index 58b1d8f7..d75e3eb2 100644 --- a/recipes-bsp/atf/atf_git.bb +++ b/recipes-bsp/atf/atf_git.bb @@ -12,7 +12,7 @@ do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" S = "${WORKDIR}/git" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" -SRCREV = "17f94e4315e81e3d1b22d863d9614d724e8273dc" +SRCREV = "85e98b945172118c55f0cea9c1f655b4307e6fab" SRC_URI += "file://0001-fix-fiptool-build-error.patch \ file://0001-Makefile-add-CC-gcc.patch \ @@ -33,9 +33,11 @@ LD[unexport] = "1" EXTRA_OEMAKE += "HOSTCC='${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}'" BOOTTYPE ?= "nor nand qspi flexspi_nor sd emmc" +OTABOOTTYPE ?= "nor qspi flexspi_nor" BUILD_SECURE = "${@bb.utils.contains('DISTRO_FEATURES', 'secure', 'true', 'false', d)}" BUILD_OPTEE = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'true', 'false', d)}" BUILD_FUSE = "${@bb.utils.contains('DISTRO_FEATURES', 'fuse', 'true', 'false', d)}" +BUILD_OTA = "${@bb.utils.contains('DISTRO_FEATURES', 'ota', 'true', 'false', d)}" PACKAGECONFIG ??= " \ ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \ @@ -95,11 +97,19 @@ do_compile() { bl32opt="BL32=${bl32}" spdopt="SPD=opteed" fi + + if [ "${BUILD_OTA}" = "true" ]; then + otaopt="POLICY_OTA=1" + btype="${OTABOOTTYPE}" + else + btype="${BOOTTYPE}" + fi + if [ -f ${DEPLOY_DIR_IMAGE}/ddr-phy/ddr4_pmu_train_dmem.bin ]; then cp ${DEPLOY_DIR_IMAGE}/ddr-phy/*.bin ${S}/ fi - for d in ${BOOTTYPE}; do + for d in ${btype}; do case $d in nor) rcwimg="${RCWNOR}${rcwtemp}.bin" @@ -118,6 +128,9 @@ do_compile() { sd) rcwimg="${RCWSD}${rcwtemp}.bin" ;; + emmc) + rcwimg="${RCWEMMC}${rcwtemp}.bin" + ;; flexspi_nor) rcwimg="${RCWXSPI}${rcwtemp}.bin" uefiboot="${UEFI_XSPIBOOT}" @@ -126,7 +139,7 @@ do_compile() { if [ -f "${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg}" ]; then oe_runmake V=1 -C ${S} realclean - oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${bl33} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} + oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${bl33} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} ${otaopt} cp -r ${S}/build/${PLATFORM}/release/bl2_${d}*.pbl ${S} cp -r ${S}/build/${PLATFORM}/release/fip.bin ${S} if [ "${BUILD_FUSE}" = "true" ]; then @@ -135,7 +148,7 @@ do_compile() { if [ ${MACHINE} = ls1012afrwy ]; then oe_runmake V=1 -C ${S} realclean - oe_runmake V=1 -C ${S} all fip pbl PLAT=ls1012afrwy_512mb BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${bl33} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} + oe_runmake V=1 -C ${S} all fip pbl PLAT=ls1012afrwy_512mb BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${bl33} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} ${otaopt} cp -r ${S}/build/ls1012afrwy_512mb/release/bl2_qspi${secext}.pbl ${S}/bl2_${d}${secext}_512mb.pbl cp -r ${S}/build/ls1012afrwy_512mb/release/fip.bin ${S}/fip_512mb.bin if [ "${BUILD_FUSE}" = "true" ]; then @@ -144,7 +157,7 @@ do_compile() { fi if [ -n "${uefiboot}" -a -f "${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot}" ]; then oe_runmake V=1 -C ${S} realclean - oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} + oe_runmake V=1 -C ${S} all fip pbl PLAT=${PLATFORM} BOOT_MODE=${d} RCW=${DEPLOY_DIR_IMAGE}/rcw/${PLATFORM}/${rcwimg} BL33=${DEPLOY_DIR_IMAGE}/uefi/${PLATFORM}/${uefiboot} ${bl32opt} ${spdopt} ${secureopt} ${fuseopt} ${otaopt} cp -r ${S}/build/${PLATFORM}/release/fip.bin ${S}/fip_uefi.bin fi fi -- 2.40.1