layerscape: update packages with LSDK git trees

NXP Layerscape LSDK had set up its own open source web site
and github for release.

https://lsdk.github.io
https://github.com/qoriq-open-source

This patch is to update rcw/fman_ucode/u-boot packages with LSDK
git trees. Also add some patches of packages to support LEDE.
Since ARMv8 32-bit u-boot images are same with ARMv8 64-bit images
but 64-bit toolchain couldn't be used for 32-bit targets, we still
use a private tree for ARMv8 32-bit u-boot images. This is in plan
to move this private tree to NXP Layerscape github.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>

3 files changed, 42 insertions, 22 deletions

diff --git a/package/firmware/fman-ucode/Makefile b/package/firmware/fman-ucode/Makefile
index 396750f804..e2969323e4 100644
--- a/package/firmware/fman-ucode/Makefile
+++ b/package/firmware/fman-ucode/Makefile
@@ -9,19 +9,16 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=fman-ucode
-PKG_VERSION:=fsl-sdk-v2.0
+PKG_VERSION:=2017.09
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=209c60e4efaa3ce9c9a954266a7210fa0047a2de47ce00a412aa0318d94d0d88
-PKG_SOURCE_URL:=https://github.com/fsl-jyt/fm-ucode.git
-PKG_SOURCE_VERSION:=b19c645821941493fbef32e616b5a16404259976
+PKG_SOURCE_URL:=https://github.com/qoriq-open-source/fm-ucode.git
+PKG_SOURCE_VERSION:=c275e91392e2adab1ed22f3867b8269ca3c54014
+PKG_MIRROR_HASH:=80d8d2454063b7f730ef49d7a44be8f8870711ee5109c53a0881b62026037a37
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
-
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
@@ -33,12 +30,12 @@ endef
 
 define fman/ls1043ardb
 	TITLE=FMAN UCODE $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
-	CONFIG=fsl_fman_ucode_ls1043_r1.0_108_4_5.bin
+	CONFIG=fsl_fman_ucode_ls1043_r1.1_106_4_18.bin
 endef
 
 define fman/ls1046ardb
 	TITLE=FMAN UCODE $(PKG_NAME)-$(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
-	CONFIG=fsl_fman_ucode_t2080_r1.1_106_4_18.bin
+	CONFIG=fsl_fman_ucode_ls1046_r1.0_106_4_18.bin
 endef
 
 FMANS := \
@@ -51,7 +48,7 @@ define Package/fman-layerscape-$(1)
 	CATEGORY:=Firmware
 	DEPENDS:=@TARGET_layerscape
 	TITLE:=$(2)
-	URL:=http://git.freescale.com/git/cgit.cgi/ppc/sdk/fm-ucode.git
+	URL:=https://github.com/qoriq-open-source/fm-ucode.git
 	VARIANT:=$(1)
 	MAINTAINER:=Jiang Yutang <jiangyutang1978@gmail.com>
 endef
diff --git a/package/firmware/rcw/Makefile b/package/firmware/rcw/Makefile
index bae9c95b6c..a065385189 100644
--- a/package/firmware/rcw/Makefile
+++ b/package/firmware/rcw/Makefile
@@ -9,18 +9,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=rcw
-PKG_VERSION:=v1.0
+PKG_VERSION:=2017.09
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_MIRROR_HASH:=8082979dbdef57e36a3096986aa426ef678c152403eb1dbd132da28f01490b6d
-PKG_SOURCE_URL:=https://github.com/fsl-jyt/rcw.git
-PKG_SOURCE_VERSION:=17e09e19bd5cf94e5ebc84916b4607743c29723e
+PKG_SOURCE_URL:=https://github.com/qoriq-open-source/rcw.git
+PKG_SOURCE_VERSION:=1a6236a34166219de324a105971eb9de05cde76e
+PKG_MIRROR_HASH:=6da17ad6b4d148bd991a85bf601f845a41231d6f0bf20153ba1a7a387727aef0
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPL-2.0 GPL-2.0+
-PKG_LICENSE_FILES:=Licenses/README
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_FLAGS:=nonshared
 
@@ -33,17 +33,17 @@ endef
 
 define rcw/ls1043ardb
 	TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
-	CONFIG=ls1043ardb-rcw.bin
+	CONFIG=ls1043ardb/RR_FQPP_1455/rcw_1600.bin
 endef
 
 define rcw/ls1046ardb
 	TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
-	CONFIG=ls1046ardb-rcw.bin
+	CONFIG=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot_swap.bin
 endef
 
 define rcw/ls1012ardb
 	TITLE=RCW binary $(PKG_NAME)-$(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
-	CONFIG=ls1012ardb-rcw.bin
+	CONFIG=ls1012ardb/R_SPNH_3508/PBL_0x35_0x08_800_250_1000_default.bin
 endef
 
 RCWS := \
@@ -77,9 +77,6 @@ endif
 define Build/Configure
 endef
 
-define Build/Compile
-endef
-
 define Package/rcw/install/default
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin
diff --git a/package/firmware/rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch b/package/firmware/rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch
new file mode 100644
index 0000000000..1eac881899
--- /dev/null
+++ b/package/firmware/rcw/patches/0001-makefile-generate-byte_swap-rcw-for-ls1046ardb.patch
@@ -0,0 +1,26 @@
+From 6836519a638a0c30ef3d2137c248a1a9f1befbc4 Mon Sep 17 00:00:00 2001
+From: Yangbo Lu <yangbo.lu@nxp.com>
+Date: Tue, 4 Jul 2017 20:25:40 +0800
+Subject: [PATCH] makefile: generate byte_swap rcw for ls1046ardb
+
+Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index fb55c8b..ab1b573 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,6 +11,8 @@ all install clean:
+ 	@for board in $(BOARDS); do \
+ 		$(MAKE) -C $$board $@ DESTDIR=$(DESTDIR)/$$board; \
+ 	done
++	tclsh ./tools/byte_swap.tcl ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin  \
++		ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot_swap.bin 8
+ 
+ release: $(foreach board,$(BOARDS),rcw-$(board)-$(VER).tar.gz)
+ 
+-- 
+2.7.4
+