From 1eeb91b642f88cb7427934eeea1d43ff6ff84a58 Mon Sep 17 00:00:00 2001
From: Chunrong Guo <chunrong.guo@nxp.com>
Date: Fri, 5 Jul 2019 11:12:11 +0800
Subject: [PATCH] atf: update to 17f94e4

*update to lsdk 1906 tag
include the following changes:
17f94e4 - plat/nxp/fsl_sec: Remove infinite loop from DEBUG Build
2d18325 - plat/nxp: Change MMU mapping of QSPI, NOR flash to MEMORY from DEVICE
5b8b9a3 - plat/nxp: Add lx2160aqds support
332c6ee - Merge branch 'LSDK' of ssh://bitbucket.sw.nxp.com/gitam/atf into LSDK
1e4b1e6 - Merge pull request #41 in GITAM/atf from ~NXA19332/atf-fork:LSDK to LSDK
693673c - plat: nxp: ls1028rdb: optimize DDR performance
8976e00 - Merge pull request #36 in GITAM/atf from ~NXA27427/atf:jira/PLATSEC-822 to LSDK
af21b29 - common: include: correct setbits_le32 macro
3947e8e - plat/nxp/tools: Adds flag to check CRC&STOP or STOP command.
c8af318 - nxp: ddr: ls1012a: fixes random hang issue
fea3df8 - Merge pull request #30 in GITAM/atf from ~NXF49783/atf:LSDK to LSDK
1df8fb4 - Merge pull request #38 in GITAM/atf from ls1028_brup to LSDK
7e3f1fc - nxp: drivers: ddr: phy-gen2: add PllCtrl settings
07a2317 - nxp/ls1046: Add support for frwy board
25443b9 - plat: nxp: ddr: update ODT and output driver impedance
b68a2d7 - csf_hdr_parser/input_blx_ch2: Corrects OEMUID 0 input attribute name.
5b14d6d - plat/nxp/drivers/sfp: Reset the data value at the set GPIO pin.
89963ec - Merge branch 'LSDK' of ssh://bitbucket.sw.nxp.com/gitam/atf into LSDK
b54f200 - nxp/ls1028a: Enable core timebase

*add ls1046afrwy support
*install fip_ddr_sec.bin

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
---
 recipes-bsp/atf/atf_git.bb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb
index 2f8a38a0..0f70d730 100644
--- a/recipes-bsp/atf/atf_git.bb
+++ b/recipes-bsp/atf/atf_git.bb
@@ -13,7 +13,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 = "7e34aebe658c7c3439d2d68b0ce6b9776e8e6996"
+SRCREV = "17f94e4315e81e3d1b22d863d9614d724e8273dc"
 
 SRC_URI += "file://0001-fix-fiptool-build-error.patch \
     file://0001-Makefile-add-CC-gcc.patch \
@@ -47,6 +47,7 @@ chassistype_ls1012ardb = "ls104x_1012"
 chassistype_ls1012afrwy = "ls104x_1012"
 chassistype_ls1043ardb = "ls104x_1012"
 chassistype_ls1046ardb = "ls104x_1012"
+chassistype_ls1046afrwy = "ls104x_1012"
 
 ddrphyopt ?= ""
 ddrphyopt_lx2160ardb = "fip_ddr_sec"
@@ -97,6 +98,10 @@ do_compile() {
             ;;
         qspi)
             rcwimg="${RCWQSPI}${rcwtemp}.bin"
+            uefiboot="${UEFI_QSPIBOOT}"
+            if [ "${BUILD_SECURE}" = "true" ] && [ ${MACHINE} = ls1046ardb ]; then
+                rcwimg="RR_FFSSPPPH_1133_5559/rcw_1600_qspiboot_sben.bin"
+            fi
             ;;
         sd)
             rcwimg="${RCWSD}${rcwtemp}.bin"
@@ -165,6 +170,9 @@ do_install() {
             fi
     fi
     chown -R root:root ${D}
+    if [ -f "${S}/fip_ddr_sec.bin" ]; then
+        cp -r ${S}/fip_ddr_sec.bin ${D}/boot/atf/fip_ddr_sec.bin
+    fi
 }
 
 do_deploy() {
@@ -195,6 +203,9 @@ do_deploy() {
                 cp -r ${S}/fuse_fip_512mb.bin ${D}/boot/atf/fuse_fip_512mb${secext}.bin
         fi
     fi
+    if [ -f "${S}/fip_ddr_sec.bin" ]; then
+        cp -r ${D}/boot/atf/fip_ddr_sec.bin ${DEPLOYDIR}/atf/fip_ddr_sec.bin
+    fi
 }
 addtask deploy after do_install
 FILES_${PN} += "/boot"
-- 
2.40.1