[meta-fsl-arm, dizzy][PATCH 7/13] apptrk: add recipes for Layerscape1 support

[meta-fsl-arm, dizzy][PATCH 7/13] apptrk: add recipes for Layerscape1 support

[b40290]

From: Chunrong Guo <B40290@freescale.com>

   Debug agent for Freescale CodeWarrior debugger

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 ...trk-install-create-all-components-of-DEST.patch | 24 ++++++++++++++++++++++
 recipes-bsp/apptrk/apptrk/no-strip.patch           | 20 ++++++++++++++++++
 recipes-bsp/apptrk/apptrk_git.bb                   | 24 ++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch
 create mode 100644 recipes-bsp/apptrk/apptrk/no-strip.patch
 create mode 100644 recipes-bsp/apptrk/apptrk_git.bb

diff --git a/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch b/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch
new file mode 100644
index 0000000..6b4a0e8
--- /dev/null
+++ b/recipes-bsp/apptrk/apptrk/apptrk-install-create-all-components-of-DEST.patch
@@ -0,0 +1,24 @@
+Upstream-Status: Pending 
+
+Signed-off-by: Chunrong Guo <B40290@freescale.com>
+
+
+  for  fix the following error:
+  |install: cannot create regular file /usr/bin/apptrk
+  |No such file or directory
+
+
+--- a/Makefileold	2014-12-21 23:46:26.872329032 -0600
++++ b/Makefile	2014-12-21 23:47:33.724326646 -0600
+@@ -89,9 +89,9 @@
+ # Other Targets
+ install: all
+ 	if [ -f $(DESTDIR)/usr/bin/apptrk ]; then rm -f $(DESTDIR)/usr/bin/apptrk ; fi
+-	install $(OUTPUT) $(DESTDIR)/usr/bin/apptrk
++	install -D $(OUTPUT) $(DESTDIR)/usr/bin/apptrk
+ 	if [ -f $(DESTDIR)/usr/bin/apptrk_debug ]; then rm -f $(DESTDIR)/usr/bin/apptrk_debug ; fi
+-	install $(OUTPUT_DBG) $(DESTDIR)/usr/bin/apptrk_debug
++	install -D $(OUTPUT_DBG) $(DESTDIR)/usr/bin/apptrk_debug
+ 
+ clean:
+ 	-$(RM) $(OBJS)$(OBJS_DBG)$(EXECUTABLES)$(C_DEPS)$(C_DEPS_DBG) $(OUTPUT) $(OUTPUT_DBG)
diff --git a/recipes-bsp/apptrk/apptrk/no-strip.patch b/recipes-bsp/apptrk/apptrk/no-strip.patch
new file mode 100644
index 0000000..a8cf620
--- /dev/null
+++ b/recipes-bsp/apptrk/apptrk/no-strip.patch
@@ -0,0 +1,20 @@
+Disable stripping of binaries
+
+We don't want to strip these as this is handled separately at package
+time.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Chunrong Guo <B40290@freescale.com>
+
+--- a/Makefileold	2015-01-07 03:45:32.786477574 -0600
++++ b/Makefile	2015-01-07 03:46:28.426475588 -0600
+@@ -62,7 +62,7 @@
+ # CFLAGS += -DENABLE_64BIT_SUPPORT
+ 
+ 
+-LDFLAGS += -s
++
+ 
+ # Add inputs and outputs from these tool invocations to the build variables 
+ 
diff --git a/recipes-bsp/apptrk/apptrk_git.bb b/recipes-bsp/apptrk/apptrk_git.bb
new file mode 100644
index 0000000..d4e6c59
--- /dev/null
+++ b/recipes-bsp/apptrk/apptrk_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Debug agent for Freescale CodeWarrior"
+SECTION = "apptrk"
+LICENSE = "Freescale-EULA"
+LIC_FILES_CHKSUM = "file://COPYING;md5=95560debfde180684364319811cc1421"
+
+DEPENDS = "elfutils"
+
+inherit kernel-arch
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/apptrk.git;nobranch=1 \
+    file://apptrk-install-create-all-components-of-DEST.patch \
+    file://no-strip.patch \
+"
+SRCREV = "cbed10997c5e2a4aaa004fb0e1efec858bf1bbe1"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = ""
+
+CFLAGS += " -I${STAGING_INCDIR}"
+
+do_install() {
+        oe_runmake install DESTDIR=${D}
+}
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 8/13] asf : add recipes for Layerscape1 support

[b40290]

From: Chunrong Guo <B40290@freescale.com>

     1. ASF depend on ipsec-tools in meta-openembeded.
     2. ASF is Linux kernel implementation for accelerating the data pat
      processing on the Freescale family of processors

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 openembedded-layer/recipes-kernel/asf/asf_git.bb | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 openembedded-layer/recipes-kernel/asf/asf_git.bb

diff --git a/openembedded-layer/recipes-kernel/asf/asf_git.bb b/openembedded-layer/recipes-kernel/asf/asf_git.bb
new file mode 100644
index 0000000..9c48366
--- /dev/null
+++ b/openembedded-layer/recipes-kernel/asf/asf_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Non-DPAA software Application Specific Fast-path"
+SECTION = "asf"
+LICENSE = "GPLv2 & GPLv2+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/asf.git;branch=sdk-v1.7.x"
+SRCREV = "16eb472d6b2b34c8b605a86c469611bc8ddec1c9"
+
+inherit module
+
+S = "${WORKDIR}/git/asfmodule"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+do_install(){
+	mkdir -p ${D}/${libexecdir} 
+       mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/asf
+	cp -rf ${S}/bin/full ${D}/lib/modules/${KERNEL_VERSION}/asf 
+	cp -rf ${S}/bin/min  ${D}/lib/modules/${KERNEL_VERSION}/asf
+	cp -rf ${S}/scripts ${D}/${libexecdir}/
+}
+
+FILES_${PN} += "${libexecdir} /lib/modules/${KERNEL_VERSION}/asf"
+RDEPENDS_${PN} += "ipsec-tools"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 10/13] cst: add recipes for Layerscape1 support

[b40290]

From: Chunrong Guo <B40290@freescale.com>

  cst is the utility for security boot.

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-devtools/cst/cst_git.bb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 recipes-devtools/cst/cst_git.bb

diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb
new file mode 100644
index 0000000..0684a26
--- /dev/null
+++ b/recipes-devtools/cst/cst_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "CST Tool"
+SECTION = "cst"
+LICENSE = "BSD"
+
+# TODO: fix license - this file is not a license
+LIC_FILES_CHKSUM = "file://RELEASENOTES;beginline=8;endline=43;md5=5a7b22a2c96b5f94e0498c5f413aa8d3"
+
+DEPENDS += "openssl"
+
+inherit kernel-arch
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/cst.git;branch=sdk-v1.7.x"
+SRCREV = "2d35e98539c0daa2bc8049e3bd44994d3d93bbe7"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"'
+
+PARALLEL_MAKE = ""
+
+do_install () {
+    oe_runmake install DESTDIR=${D} BIN_DEST_DIR=${bindir}
+}
+
+FILES_${PN}-dbg += "${bindir}/cst/.debug"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 1/13] linux-ls1: update to sdk v1.7 release

[b40290]

From: Chunrong Guo <B40290@freescale.com>

      This includes following changes:

      bdb722f arm: dts: ls1021a-twr: remove dspi1 node for cannot be verified
      fb3f709 arm: ls1: only call ls1_pm_iomap() when doing deep sleep
      c15b78f ls1021a/dts: Add eTSEC1 as wake-up event source
      5f94f9f qspi: ls102xa: Adjust the size of QSPI AMBA Bus memory map

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/ls1021aqds.conf           | 2 +-
 conf/machine/ls1021atwr.conf           | 2 +-
 recipes-kernel/linux/linux-ls1.inc     | 4 ++--
 recipes-kernel/linux/linux-ls1_3.12.bb | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
index d659196..24ee6df 100644
--- a/conf/machine/ls1021aqds.conf
+++ b/conf/machine/ls1021aqds.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
 UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
 UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
 
-KERNEL_DEVICETREE = "ls1021aqds.dtb"
+KERNEL_DEVICETREE = "ls1021a-qds.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index e549ac3..1d46f98 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -15,7 +15,7 @@ UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
 UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
 
 
-KERNEL_DEVICETREE ?= "ls1021atwr.dtb"
+KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
diff --git a/recipes-kernel/linux/linux-ls1.inc b/recipes-kernel/linux/linux-ls1.inc
index 72be738..cd8398e 100644
--- a/recipes-kernel/linux/linux-ls1.inc
+++ b/recipes-kernel/linux/linux-ls1.inc
@@ -2,9 +2,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 inherit kernel fsl-kernel-localversion
-LOCALVERSION ?= "-${SRCBRANCH}"
+LOCALVERSION ?= "+ls1"
 
-SRC_URI = "git://git.freescale.com/layerscape/ls1021a/linux.git;branch=${SRCBRANCH} \
+SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;branch=${SRCBRANCH} \
     file://defconfig \
 "
 
diff --git a/recipes-kernel/linux/linux-ls1_3.12.bb b/recipes-kernel/linux/linux-ls1_3.12.bb
index 4e1e85b..c33485c 100644
--- a/recipes-kernel/linux/linux-ls1_3.12.bb
+++ b/recipes-kernel/linux/linux-ls1_3.12.bb
@@ -5,7 +5,7 @@ Layerscape1 Family Boards. "
 require recipes-kernel/linux/linux-ls1.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-SRCBRANCH = "ls1-dev"
-SRCREV = "3ced9e82f9f3f7b232bea0bd18c9a62572c06b44"
+SRCBRANCH = "sdk-v1.7.x"
+SRCREV = "6619b8b55796cdf0cec04b66a71288edd3057229"
 
 COMPATIBLE_MACHINE = "(ls102xa)"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 12/13] ls1021aqds.conf : add QE_UCODE

[b40290]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/ls1021aqds.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
index f3bc1b4..6281538 100644
--- a/conf/machine/ls1021aqds.conf
+++ b/conf/machine/ls1021aqds.conf
@@ -15,6 +15,8 @@ UBOOT_CONFIG[qspi] = "ls1021aqds_qspi_config"
 UBOOT_CONFIG[nor-secboot] = "ls1021aqds_nor_secboot_config"
 UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
 
+QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
+
 KERNEL_DEVICETREE = "ls1021a-qds.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 2/13] ls1021aqds.conf: add ttyAMA0 console

[b40290]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/ls1021aqds.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1021aqds.conf b/conf/machine/ls1021aqds.conf
index 24ee6df..f3bc1b4 100644
--- a/conf/machine/ls1021aqds.conf
+++ b/conf/machine/ls1021aqds.conf
@@ -17,6 +17,6 @@ UBOOT_CONFIG[lpuart] = "ls1021aqds_lpuart_config"
 
 KERNEL_DEVICETREE = "ls1021a-qds.dtb"
 
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 USE_VT ?= "0"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 13/13] ls1021atwr.conf : add QE_UCODE

[b40290]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/ls1021atwr.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 4dfbe57..6c302d5 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -14,6 +14,7 @@ UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
 UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
 UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
 
+QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
 
 KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 3/13] ls1021atwr.conf: add ttyAMA0 console

[b40290]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 conf/machine/ls1021atwr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index e549ac3..87b5e2c 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -17,7 +17,7 @@ UBOOT_CONFIG[lpuart] = "ls1021atwr_lpuart_config"
 
 KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 USE_VT ?= "0"
 
-- 
1.8.3.2

[meta-fsl-arm, dizzy][PATCH 11/13] qemu-fsl: add recipes for Layerscape1 support

[b40290]

From: Chunrong Guo <B40290@freescale.com>

   QEMU is a generic and open source machine emulator and virtualizer.

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 recipes-devtools/qemu/qemu-fsl_git.bb

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
new file mode 100644
index 0000000..20386e2
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -0,0 +1,50 @@
+require recipes-devtools/qemu/qemu.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
+
+# This means QEMU v1.7 with FSL specific patches applied
+PV = "1.7+${SRCPV}"
+
+# NOTE: these options are note available in qemu 1.7, but qemu.inc assumes
+# version 2.0+ where they are available. For now we unset them, but we should
+# remove the following lines when upgrading to qemu 2.0+:
+PACKAGECONFIG[quorum] = ""
+PACKAGECONFIG[lzo]    = ""
+PACKAGECONFIG[numa]   = ""
+PACKAGECONFIG[gtk+]   = ""
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v1.7.x \
+"
+SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db"
+
+S = "${WORKDIR}/git"
+
+QEMU_TARGETS = "arm"
+
+inherit pkgconfig
+
+# Append build host pkg-config paths for native target since the host may provide sdl
+do_configure_prepend() {
+        export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
+}
+
+do_configure_append () {
+   if ! grep 'CONFIG_FDT=y' config-host.mak; then
+        echo "CONFIG_RDMA=y" >> config_host_mak
+   fi
+}
+
+# gets around qemu.inc trying to install powerpc_rom.bin
+do_install_prepend() {
+	touch ${WORKDIR}/powerpc_rom.bin
+}
+
+do_install_append() {
+	rm ${WORKDIR}/powerpc_rom.bin
+
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+}
+
+FILES_${PN} += "/usr/share/qemu/"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 9/13] qe-ucode: add recipes for Layerscape1 support

[b40290]

From: Chunrong Guo <B40290@freescale.com>

   *qe-ucode are the microcode binaries for the QUICC Engine hardware block in QorIQ
  products.

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-bsp/qe-ucode/qe-ucode_git.bb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 recipes-bsp/qe-ucode/qe-ucode_git.bb

diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
new file mode 100644
index 0000000..28af4b6
--- /dev/null
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "qe microcode binary"
+SECTION = "qe-ucode"
+LICENSE = "Freescale-EULA"
+LIC_FILES_CHKSUM = "file://EULA;md5=60037ccba533a5995e8d1a838d85799c"
+
+inherit deploy
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/qe-ucode.git;nobranch=1"
+SRCREV= "49efc94b553de5c2a9bd28093592eff0068e161c"
+
+S = "${WORKDIR}/git"
+
+python () {
+	if not d.getVar("QE_UCODE", True):
+		PN = d.getVar("PN", True)
+		FILE = os.path.basename(d.getVar("FILE", True))
+		bb.debug(1, "To build %s, see %s for instructions on \
+			     setting up your qe-ucode" % (PN, FILE))
+		raise bb.parse.SkipPackage("because QE_UCODE is not set")
+}
+
+do_install () {
+       install -d ${D}/boot
+       install -m 644 ${QE_UCODE} ${D}/boot
+}
+
+do_deploy () {
+       install -d ${DEPLOYDIR}/boot
+       install -m 644 ${QE_UCODE} ${DEPLOYDIR}/boot
+}
+addtask deploy before do_build after do_install
+
+PACKAGES += "${PN}-image"
+FILES_${PN}-image += "/boot/*"
+ALLOW_EMPTY_${PN} = "1"
+COMPATIBLE_MACHINE = "(ls102xa)"
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 4/13] rcw: update to sdk v1.7 release

[b40290]

From: Chunrong Guo <B40290@freescale.com>

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-bsp/rcw/rcw_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 5af2e3a..0d10548 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -7,9 +7,9 @@ DEPENDS += "u-boot-ls1-tools-native"
 
 inherit deploy
 
-SRCBRANCH = "LS1-SDK"
-SRCREV = "38ec2c9111b483203797f7228db5f92549e9fe73"
-SRC_URI = "git://git.freescale.com/layerscape/ls1021a/rcw.git;branch=${SRCBRANCH} \
+SRCBRANCH = "sdk-v1.7.x"
+SRCREV = "3e89f378ed70e9b856756de8c3dbdfccb045fa0c"
+SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git;branch=${SRCBRANCH} \
     file://rcw-make-BOARDS-DESTDIR-overidable-in-Makefile.patch \
 "
 
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 6/13] u-boot-ls1-tools-native: fix the git url and SHA

[b40290]

From: Chunrong Guo <B40290@freescale.com>

   the byte_swap.tcl script is provided by another FSL u-boot tree, fix following
   build error:
   | install: cannot stat `/home/yocto/poky/build_ls1021atwr_release/tmp/work/x86_64-linux/u-boot-ls1-tools-native/2013.10-r0/git/byte_swap.tcl': No such file or directory

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-bsp/u-boot/u-boot-ls1-tools-native_2013.10.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-bsp/u-boot/u-boot-ls1-tools-native_2013.10.bb b/recipes-bsp/u-boot/u-boot-ls1-tools-native_2013.10.bb
index 9d15bb6..09cf1f7 100644
--- a/recipes-bsp/u-boot/u-boot-ls1-tools-native_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-ls1-tools-native_2013.10.bb
@@ -1,5 +1,8 @@
 require u-boot-ls1.inc
 
+SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=LS1-dev"
+SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
+
 RDEPENDS += "tcl-native"
 
 inherit native
-- 
1.9.2

[meta-fsl-arm, dizzy][PATCH 5/13] u-boot-ls1: Upgrade to 2014.07 version

[b40290]

From: Chunrong Guo <B40290@freescale.com>

   This includes following changes:
   2bf1c34 ls102xa: scfg: Remove SCFG bit reverse setting on LS1
   80b1d30 ls1021atwr: SECURE BOOT- Add secure boot target for ls1021atwr
   49eaf3e board/ls1021aqds: Add support to test GPIO by enabling EC3
   16111c4 ls102xa: spi: Fix QSPI and DSPI compatibility issue on LS1021ATWR board

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 recipes-bsp/u-boot/u-boot-ls1.inc        |  6 +++---
 recipes-bsp/u-boot/u-boot-ls1_2013.10.bb | 24 ------------------------
 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-ls1_2014.07.bb

diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc
index 9e10ea5..ccd37c6 100644
--- a/recipes-bsp/u-boot/u-boot-ls1.inc
+++ b/recipes-bsp/u-boot/u-boot-ls1.inc
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRCBRANCH = "LS1-dev"
-SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}"
-SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
+SRCBRANCH = "sdk-v1.7.x"
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH}"
+SRCREV = "659b6a23a8b1f3026200bc6352dbacef53f4dcb1"
 
 LOCALVERSION ?= "-${SRCBRANCH}"
 
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb b/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
deleted file mode 100644
index 06f6d2f..0000000
--- a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-require u-boot-ls1.inc
-inherit fsl-u-boot-localversion
-
-LOCALVERSION ?= "-SDK-V1.3"
-
-DEPENDS += "u-boot-ls1-tools-native"
-PROVIDES += "u-boot"
-
-do_compile_append () {
-    case "${UBOOT_MACHINE}" in
-        *spi*) tclsh byte_swap.tcl ${S}/u-boot.bin ${S}/u-boot.swap.bin 8 
-        mv ${S}/u-boot.swap.bin ${S}/u-boot.bin;;
-    esac
-}
-
-PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ls102xa)"
-
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
new file mode 100644
index 0000000..96944c1
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ls1_2014.07.bb
@@ -0,0 +1,24 @@
+require recipes-bsp/u-boot/u-boot.inc
+require u-boot-ls1.inc
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+DEPENDS += "u-boot-ls1-tools-native"
+PROVIDES += "u-boot"
+
+do_compile_append () {
+    case "${UBOOT_MACHINE}" in
+        *spi*) tclsh byte_swap.tcl ${S}/u-boot.bin ${S}/u-boot.swap.bin 8 
+        mv ${S}/u-boot.swap.bin ${S}/u-boot.bin;;
+    esac
+}
+
+PACKAGES += "${PN}-images"
+FILES_${PN}-images += "/boot"
+
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ls102xa)"
+
-- 
1.9.2