From 13b2735a46690f1bebe819eeb47f97b08e8129db Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Thu, 18 Jan 2018 16:24:24 +0800
Subject: [PATCH] layerscape: add ls-rcw-bin package

NXP LSDK1712 release used two rcw git trees. The
original rcw git tree was still source code but
dropping ls1012a/ls1088a/ls2088a boards in LSDK1712.
Instead another new rcw git tree was used to just
provided rcw binaries for these boards dropped. So
this patch is to update ls-rcw to LSDK1712 release
and add a new ls-rcw-bin package.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 .../firmware/layerscape/ls-rcw-bin/Makefile   | 99 +++++++++++++++++++
 package/firmware/layerscape/ls-rcw/Makefile   | 32 +-----
 2 files changed, 103 insertions(+), 28 deletions(-)
 create mode 100644 package/firmware/layerscape/ls-rcw-bin/Makefile

diff --git a/package/firmware/layerscape/ls-rcw-bin/Makefile b/package/firmware/layerscape/ls-rcw-bin/Makefile
new file mode 100644
index 0000000000..589124e448
--- /dev/null
+++ b/package/firmware/layerscape/ls-rcw-bin/Makefile
@@ -0,0 +1,99 @@
+#
+# Copyright 2017 NXP
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+PKG_NAME:=ls-rcw-bin
+PKG_SOURCE_DATE:=2017-11-19
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/NXP/qoriq-rcw-bin.git
+PKG_SOURCE_VERSION:=bf3ae3cb15829876007c553509501cdaa16745e7
+PKG_MIRROR_HASH:=dc14a47e9529578c63d9ad2bf4e27ef565a055e4121ce2d1324c019f69074314
+
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FLAGS:=nonshared
+
+include $(INCLUDE_DIR)/package.mk
+
+define rcw-bin/Default
+	TITLE:=
+	CONFIG:=
+endef
+
+define rcw-bin/ls1012ardb
+	TITLE=NXP LS1012ARDB RCW Binary
+	CONFIG=ls1012ardb/R_SPNH_3508/PBL_0x35_0x08_1000_250_1000_default.bin
+endef
+
+define rcw-bin/ls1088ardb
+	TITLE=NXP LS1088ARDB RCW Binary
+	CONFIG=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/PBL_QSPI_1600_700_2100_0x1d_0x0d.bin
+endef
+
+define rcw-bin/ls2088ardb
+	TITLE=NXP LS2088ARDB RCW Binary
+	CONFIG=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/PBL_0x2a_0x41_1800_700_1866_1600.bin
+endef
+
+define rcw-bin/ls1012afrdm
+	TITLE=NXP LS1012AFRDM RCW Binary
+	CONFIG=ls1012afrdm/N_SSNP_3305/PBL_0x33_0x05_800_250_1000_default.bin
+endef
+
+RCWS := \
+	ls1012ardb \
+	ls1088ardb \
+	ls2088ardb \
+	ls1012afrdm
+
+define Package/rcw-bin/template
+define Package/rcw-layerscape-$(1)
+	SECTION:=firmware
+	CATEGORY:=Firmware
+	DEPENDS:=@TARGET_layerscape
+	TITLE:=$(2)
+	VARIANT:=$(1)
+endef
+endef
+
+define BuildRCWPackage
+	$(eval $(rcw-bin/Default))
+	$(eval $(rcw-bin/$(1)))
+	$(call Package/rcw-bin/template,$(1),$(TITLE))
+endef
+
+ifdef BUILD_VARIANT
+$(eval $(call rcw-bin/$(BUILD_VARIANT)))
+RCW_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
+endif
+
+define Build/Compile
+endef
+
+define Package/rcw-bin/install/default
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+	$(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin
+endef
+
+define Package/rcw-bin/install/template
+define Package/rcw-layerscape-$(1)/install
+	$(call Package/rcw-bin/install/default,$(2))
+endef
+endef
+
+$(foreach r,$(RCWS), \
+	$(eval $(call Package/rcw-bin/install/template,$(r),$(r))) \
+)
+
+$(foreach r,$(RCWS), \
+	$(eval $(call BuildRCWPackage,$(r))) \
+	$(eval $(call BuildPackage,rcw-layerscape-$(r))) \
+)
diff --git a/package/firmware/layerscape/ls-rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile
index 70791d47b6..a3326abfb1 100644
--- a/package/firmware/layerscape/ls-rcw/Makefile
+++ b/package/firmware/layerscape/ls-rcw/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=ls-rcw
-PKG_SOURCE_DATE:=2017-09-26
+PKG_SOURCE_DATE:=2017-12-01
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/qoriq-open-source/rcw.git
-PKG_SOURCE_VERSION:=6719b046ee87b04026fe163e6c8fbbebba2186aa
-PKG_MIRROR_HASH:=9645ecf148640ec7d1029bce65950f2a0b0e6b351a25ef60c8a839c42c6ed56d
+PKG_SOURCE_VERSION:=cbd5e66fcb850e821c8632578410ceba5733a49e
+PKG_MIRROR_HASH:=4caad5e0ae2018a0a594f36e46e4a96698420956c64bb73656f380fd46733c3d
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -41,33 +41,9 @@ define rcw/ls1046ardb
 	CONFIG=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin.swap
 endef
 
-define rcw/ls1012ardb
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
-	CONFIG=ls1012ardb/R_SPNH_3508/PBL_0x35_0x08_1000_250_1000_default.bin
-endef
-
-define rcw/ls1088ardb
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
-	CONFIG=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/PBL_QSPI_1600_700_2100_0x1d_0x0d.bin
-endef
-
-define rcw/ls2088ardb
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
-	CONFIG=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/PBL_0x2a_0x41_1800_700_1866_1600.bin
-endef
-
-define rcw/ls1012afrdm
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
-	CONFIG=ls1012afrdm/N_SSNP_3305/PBL_0x33_0x05_800_250_1000_default.bin
-endef
-
 RCWS := \
 	ls1043ardb \
-	ls1046ardb \
-	ls1012ardb \
-	ls1088ardb \
-	ls2088ardb \
-	ls1012afrdm
+	ls1046ardb
 
 define Package/rcw/template
 define Package/rcw-layerscape-$(1)
-- 
2.30.2