From 89c4ed57b768449d58bb0830e98c9b99ea466feb Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Tue, 3 Jul 2018 11:07:06 +0800
Subject: layerscape: update ls-rcw to LSDK-18.06

The rcw source code had been migrated to codeaurora
for LSDK-18.06 release and the future release. The
source code had also involved ls1012ardb/ls1012afrdm/
ls1088ardb/ls2088ardb rcw, so we updated ls-rcw to
LSDK-18.06, reworked the makefile and dropped ls-rcw-bin
package in this patch. Also reworked ls-rcw patch to
adapt to the latest source code.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 package/firmware/layerscape/ls-rcw/Makefile | 107 +++++++++++++---------------
 1 file changed, 48 insertions(+), 59 deletions(-)

(limited to 'package/firmware/layerscape/ls-rcw/Makefile')

diff --git a/package/firmware/layerscape/ls-rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile
index a3326abfb1..8d873baf08 100644
--- a/package/firmware/layerscape/ls-rcw/Makefile
+++ b/package/firmware/layerscape/ls-rcw/Makefile
@@ -6,87 +6,76 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=ls-rcw
-PKG_SOURCE_DATE:=2017-12-01
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/qoriq-open-source/rcw.git
-PKG_SOURCE_VERSION:=cbd5e66fcb850e821c8632578410ceba5733a49e
-PKG_MIRROR_HASH:=4caad5e0ae2018a0a594f36e46e4a96698420956c64bb73656f380fd46733c3d
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_FLAGS:=nonshared
+PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
+PKG_SOURCE_VERSION:=1f43bef4b4475d8e81c9b3b8c5bdd6c1ce8cfa6c
+PKG_MIRROR_HASH:=a3b455bcc1f070c8e51f520e32b62cec5b05d772d7ae4a876d88fd5f278a7b1c
 
 include $(INCLUDE_DIR)/package.mk
 
-define rcw/Default
-	TITLE:=
-	CONFIG:=
+define Package/layerscape-rcw/Config
+  define Package/layerscape-rcw-$(1)
+    SECTION:=firmware
+    CATEGORY:=Firmware
+    TITLE:=$(2)
+    DEPENDS:=@TARGET_layerscape
+    CONFIG:=$(3)
+  endef
 endef
 
-define rcw/ls1043ardb
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
-	CONFIG=ls1043ardb/RR_FQPP_1455/rcw_1600.bin
+define Package/layerscape-rcw/ls1012ardb
+  TITLE:=NXP LS1012ARDB RCW binary
+  CONFIG:=ls1012ardb/R_SPNH_3508/rcw_1000_default.bin.swapped
 endef
 
-define rcw/ls1046ardb
-	TITLE=RCW binary $(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
-	CONFIG=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin.swap
+define Package/layerscape-rcw/ls1012afrdm
+  TITLE:=NXP LS1012AFRDM RCW binary
+  CONFIG:=ls1012afrdm/N_SSNP_3305/rcw_800.bin.swapped
 endef
 
-RCWS := \
-	ls1043ardb \
-	ls1046ardb
-
-define Package/rcw/template
-define Package/rcw-layerscape-$(1)
-	SECTION:=firmware
-	CATEGORY:=Firmware
-	DEPENDS:= @TARGET_layerscape
-	TITLE:=$(2)
-	URL:=http://git.freescale.com/git/cgit.cgi/ppc/sdk/rcw.git
-	VARIANT:=$(1)
-	MAINTAINER:=Jiang Yutang <jiangyutang1978@gmail.com>
-endef
+define Package/layerscape-rcw/ls1043ardb
+  TITLE:=NXP LS1043ARDB RCW binary
+  CONFIG:=ls1043ardb/RR_FQPP_1455/rcw_1600.bin
 endef
 
-define BuildRCWPackage
-	$(eval $(rcw/Default))
-	$(eval $(rcw/$(1)))
-	$(call Package/rcw/template,$(1),$(TITLE))
+define Package/layerscape-rcw/ls1046ardb
+  TITLE:=NXP LS1046ARDB RCW binary
+  CONFIG:=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin.swapped
 endef
 
-ifdef BUILD_VARIANT
-$(eval $(call rcw/$(BUILD_VARIANT)))
-RCW_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-endif
-
-define Build/Configure
+define Package/layerscape-rcw/ls1088ardb
+  TITLE:=NXP LS1088ARDB RCW binary
+  CONFIG:=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin
 endef
 
-define Package/rcw/install/default
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin
+define Package/layerscape-rcw/ls2088ardb
+  TITLE:=NXP LS2088ARDB RCW binary
+  CONFIG:=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin
 endef
 
-define Package/rcw/install/template
-define Package/rcw-layerscape-$(1)/install
-	$(call Package/rcw/install/default,$(2))
-endef
+define Package/layerscape-rcw/Install
+  define Package/layerscape-rcw-$(1)/install
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin
+  endef
 endef
 
-$(foreach r,$(RCWS), \
-	$(eval $(call Package/rcw/install/template,$(r),$(r))) \
-)
-
-$(foreach r,$(RCWS), \
-	$(eval $(call BuildRCWPackage,$(r))) \
-	$(eval $(call BuildPackage,rcw-layerscape-$(r))) \
+RCWS := \
+  ls1012ardb \
+  ls1012afrdm \
+  ls1043ardb \
+  ls1046ardb \
+  ls1088ardb \
+  ls2088ardb
+
+$(foreach rcw,$(RCWS), \
+	$(eval $(Package/layerscape-rcw/$(rcw))) \
+	$(eval $(call Package/layerscape-rcw/Config,$(rcw),$(TITLE),$(CONFIG))) \
+	$(eval $(call Package/layerscape-rcw/Install,$(rcw))) \
+	$(eval $(call BuildPackage,layerscape-rcw-$(rcw))) \
 )
-- 
cgit v1.2.3