From: Zhenhua Luo <zhenhua.luo@nxp.com>
Date: Tue, 20 Dec 2016 12:18:58 +0000 (+0800)
Subject: rcw: upgrade to SDK 2.0 GA-1611 release
X-Git-Tag: 2.2~62
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fb04900657aa93b28c983485cb38c3d98227874a;p=meta-freescale.git

rcw: upgrade to SDK 2.0 GA-1611 release

* disable the endianness switch for qspi u-boot of SEC boot
* included the following commits.
  * 3252b8c Merge pull request #20 in SDK/rcw from ~B21989/sdk-rcw:jira/QSDK-3097 to master
  * cd271ee Merge pull request #19 in SDK/rcw from ~B52263/rcw:jira/QSDK-3096 to master
  * 6a558a2 ls1021a: Fix QSPI endian issue for QSPI boot on LS1021A boards
  * fbfddb3 ls1043a: Fix QSPI endian issue for QSPI boot on LS1043AQDS
  * 2485a22 ls1046a: fix PBI of changing QSPI endianness
  * 7304127 ls1043ardb: adds a RCW with GIC 4K supported
  * d413878 ls1043a: Add PBI of changing GIC offset to 4K
  * e914a5f Add a tclsh script to swap the rcw endian.
  * 8411b78 ls1046aqds: Add RCW for ls1046aqds board
  * 6d486d4 ls1046ardb: Add RCW for ls1046ardb board
  * 14de148 arm: ls1021a: add the core frequency to 1.2GHZ support
  * 98b6bc3 t2080rdb: update SRDS2PLL2CR1 to 0x08004100 for errata A-007186

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 81178617..e00c0a6e 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -8,17 +8,21 @@ DEPENDS += "change-file-endianess-native tcl-native"
 inherit deploy
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=sdk-v2.0.x"
-SRCREV = "6ae9086528019ab55968da05c25bd319737c8e62"
+SRCREV = "3252b8cce8e5a214c8e652121ef9b9460663c65a"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=${D}/boot/rcw/"
+EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','').replace('-32b','')} DESTDIR=${D}/boot/rcw/"
 
 do_install () {
     oe_runmake install
     for f in `find ${D}/boot/rcw/ -name "*qspiboot*"`;do
+        if echo $f |grep -q "qspiboot_sben"; then
+            continue
+        fi
         f_swap=`echo $f |sed -e 's/qspiboot/qspiboot_swap/'`
         tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl $f $f_swap 8
+        mv -f $f_swap $f
     done
 }
 
@@ -31,6 +35,5 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_MACHINE = "(qoriq-ppc|ls1021a|ls1043a)"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-
+COMPATIBLE_MACHINE = "(qoriq)"
+PACKAGE_ARCH = "${MACHINE_ARCH}"