rcw: update to revision 426f7a6

This imports following changes:

426f7a6 SECURE BOOT: Add missing RCW's for T4240QDS
756454f SECURE BOOT: Rename the RCW's
7782087 SECURE BOOT: Remove Unwanted RCW's
e93c210 LS1021: Unset BOOT_HO bit in rcw.
4375fc4 t1023rdb: update IFC_MODE to 0x2F for errata A-009138
5cf9bc5 T4240QDS: Add four 1800MHz/Core RCW files for T4240QDS board
cff536a t1023rdb: set RTC=1 to enable GPIO1[14]
a5983f2 T4240RDB: Add one new RCW for T4240RDB board
3a6ae48 ls1021a: fix some serdes settings for SATA
31078e1 ls1021atwr: do not power down PLL which is used by SATA
c6d72e3 t2080qds: rcw: Add eMMC DDR mode RCW
c77415c T104xD4RDB: update SRDS_PLL_REF_CLK_SEL_S1 value
e2c0844 ls1021atwr: add USB 2.0 support
fd0c1df p5020/p5040: NAND Secure Boot RCW added with PBI commands
259d57d t1023rdb: add rcw for t1023rdb board
c3ab906 T1042: Add t1042d4rdb rcw files for serdes protocol 0x86
ae39560 T1040: Add t1040d4rdb rcw files for serdes protocol 0x66
b9d3c22 p3041: NAND Secure Boot RCW added with PBI commands
dc0fad9 t2080rdb: update ddr to 1866MT/s
03c5ee6 t2080: update platform clock to 600MHz
72945fa rcw: ls102xa: merge rcw for lpuart and dcu
6678741 rcw: ls102xa: Adjust the features supported in SD boot
f7a54c1 arm: ls102xa: Increase IO drive strength for LS1021AQDS board
3dd07fa B4860-As-B3: Add two new RCW files
69a041c B4860QDS: Add HWA_CGA_M3_CLK_SEL bits define in b4860.rcwi file
87289d5 ls102xa: rcw: Add QSPI boot RCW for LS1021A TWR board
13bf692 t1024: update FM1_MAC_RAT from 0 to 1
5b94b3e t1024rdb: add new rcw 0x135 and minor update

Also align with the one in meta-fsl-arm layer.

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 70 insertions, 24 deletions

diff --git a/meta-fsl-ppc/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch b/meta-fsl-ppc/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
new file mode 100644
index 00000000..49d99fc5
--- /dev/null
+++ b/meta-fsl-ppc/recipes-bsp/rcw/rcw/rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch
@@ -0,0 +1,57 @@
+From f2e796c903b2a3f81dbd38da3dc087cb7539d307 Mon Sep 17 00:00:00 2001
+From: Zhenhua Luo <zhenhua.luo@freescale.com>
+Date: Wed, 3 Sep 2014 03:03:42 -0500
+Subject: [PATCH] Makefile: make BOARDS/DESTDIR overidable and add endian
+ switch
+
+1. For one specific board, no need to build the rcw for all supported
+   targets, make BOARDS and DESTDIR overridable to achieve this.
+2. Add the endian swap for qspiboot rcw
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+---
+ Makefile     |    4 ++--
+ Makefile.inc |    9 +++++++--
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6ec1697..0f94293 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-DESTDIR = .
+-BOARDS = b4420qds b4860qds \
++DESTDIR ?= .
++BOARDS ?= b4420qds b4860qds \
+         ls1021aqds ls1021atwr \
+         p2041rdb p3041ds p4080ds p5020ds p5040ds \
+         t1024qds t1023rdb t1024rdb t1040rdb t1042rdb t1042rdb_pi t1040qds \
+diff --git a/Makefile.inc b/Makefile.inc
+index 4cadb2e..6e8b78f 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -1,4 +1,4 @@
+-DESTDIR = .
++DESTDIR ?= .
+ INSTALL = install
+ PYTHON ?= python2
+ RCW = $(PYTHON) ../rcw.py
+@@ -18,7 +18,12 @@ all: $(targets)
+ install: $(targets)
+        $(INSTALL) -d $(DESTDIR)
+        @for file in $^; do \
+-               $(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \
++               case $$file in \
++                       *qspiboot*) file_swap="`echo $$file | sed -e 's/qspiboot/qspiboot_swap/'`"; \
++                                               tclsh byte_swap.tcl $$file $$file_swap 8 ; \
++                                               $(INSTALL) -m 644 -D $$file_swap $(DESTDIR)/$$file_swap ;; \
++                       *) $(INSTALL) -m 644 -D $$file $(DESTDIR)/$$file; \
++        esac \
+        done
+        $(INSTALL) -m 644 -D README $(DESTDIR)
+ 
+-- 
+1.7.9.7
+
diff --git a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
index 5714ed0a..57f305a6 100644
--- a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
+++ b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
@@ -1,47 +1,36 @@
-DESCRIPTION = "Reset Control Words (RCW)"
-SECTION = "rcw"
+SUMMARY = "Reset Configuration Word"
+DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the QorIQ targets"
 LICENSE = "BSD"
 PR = "r8"
 
 LIC_FILES_CHKSUM = "file://rcw.py;beginline=8;endline=28;md5=9ba0b28922dd187b06b6c8ebcfdd208e"
 
-# this package is specific to the machine itself
-INHIBIT_DEFAULT_DEPS = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 inherit deploy
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;nobranch=1"
-SRCREV = "3e89f378ed70e9b856756de8c3dbdfccb045fa0c"
+SRCBRANCH = "master"
+SRCREV = "426f7a6535d93dac76f5125035e0938a85e778d2"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH} \
+    file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \
+"
 
 S = "${WORKDIR}/git"
 
-export PYTHON
+EXTRA_OEMAKE = "BOARDS=${@d.getVar('MACHINE', True).replace('-64b','')} DESTDIR=${D}/boot/rcw/"
 
 do_install () {
-    make install
-
-    M=`echo ${MACHINE} | sed s/-64b//g`
-    if [ "t1042rdb" = "${M}" ] || [ "t1042rdb-pi" = "${M}" ];then
-        M=t1042rdb_pi
-    fi
-    install -d ${D}/boot/rcw
-    cp -r ${S}/${M}/${M}/* ${D}/boot/rcw
+    oe_runmake install
 }
 
 do_deploy () {
-    M=`echo ${MACHINE} | sed s/-64b//g`
-    if [ "t1042rdb" = "${M}" ] || [ "t1042rdb-pi" = "${M}" ];then
-        M=t1042rdb_pi
-    fi
     install -d ${DEPLOYDIR}/rcw
-    cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/rcw
+    cp -r ${D}/boot/rcw/* ${DEPLOYDIR}/rcw/
 }
 addtask deploy after do_install
 
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_HOST_qoriq-ppc = ".*"
-COMPATIBLE_HOST ?= "(none)"
 ALLOW_EMPTY_${PN} = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(qoriq-ppc)"