From a705853609f2f53cdf97e2e0a45f09cde726446f Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sat, 13 Oct 2018 00:26:54 +0800
Subject: [PATCH] update intel CPU microcode

---
 package/firmware/ath10k-firmware/Makefile     |   8 +-
 package/firmware/intel-microcode/Makefile     |   6 +-
 .../firmware/layerscape/fman-ucode/Makefile   |  80 +++--------
 package/firmware/layerscape/ls-dpl/Makefile   |  31 ++--
 package/firmware/layerscape/ls-mc/Makefile    |  20 +--
 package/firmware/layerscape/ls-ppa/Makefile   | 117 ++++++---------
 .../firmware/layerscape/ls-rcw-bin/Makefile   |  99 -------------
 package/firmware/layerscape/ls-rcw/Makefile   | 135 +++++++++---------
 ...rt-byte-swapping-without-tclsh-tool.patch} |  50 ++++---
 .../layerscape/ppfe-firmware/Makefile         |  10 +-
 10 files changed, 200 insertions(+), 356 deletions(-)
 delete mode 100644 package/firmware/layerscape/ls-rcw-bin/Makefile
 rename package/firmware/layerscape/ls-rcw/patches/{0001-rcw-add-a-python-script-for-byte-swapping.patch => 0001-rcw-support-byte-swapping-without-tclsh-tool.patch} (50%)

diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
index 256f988d1..779765a42 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-firmware
-PKG_SOURCE_DATE:=2018-09-06
-PKG_SOURCE_VERSION:=327ee47ed67e58deb2c76c822221440c36ed952f
-PKG_MIRROR_HASH:=e52e1e8ceaf6dc2679a7bd974df22113687fd18059efb0417e95f1583310bbc8
+PKG_SOURCE_DATE:=2018-05-12
+PKG_SOURCE_VERSION:=952afa4949cb34193040cd4e7441e1aee50ac731
+PKG_MIRROR_HASH:=dd300f3f28b8f8c07c93065fd9dc1c9785ebda8f15398b4d2d33f9418adcaf46
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -473,7 +473,7 @@ define Package/ath10k-firmware-qca9984/install
 		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9984/hw1.0/3.6.0.1/firmware-5.bin_10.4-3.6.0.1-00003 \
+		$(PKG_BUILD_DIR)/QCA9984/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00053 \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
 endef
 
diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile
index 9571feed9..6987c795c 100644
--- a/package/firmware/intel-microcode/Makefile
+++ b/package/firmware/intel-microcode/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=intel-microcode
-PKG_VERSION:=20180703
-PKG_RELEASE:=2
+PKG_VERSION:=20180807a
+PKG_RELEASE:=1
 
 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/
-PKG_HASH:=26dfaa47100ce3d06f968edefa7539da10de7b96d5d8e26ee8174a040ee5cdae
+PKG_HASH:=1a7cb96d5c6a4abac2936236223d9bea79d7442dc1cfe9b712ff8e35374f0f9f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE)
 
 PKG_BUILD_DEPENDS:=iucode-tool/host
diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile
index 495aee99e..f211f83de 100644
--- a/package/firmware/layerscape/fman-ucode/Makefile
+++ b/package/firmware/layerscape/fman-ucode/Makefile
@@ -6,84 +6,46 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=fman-ucode
-PKG_SOURCE_DATE:=2017-02-13
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/NXP/qoriq-fm-ucode.git
 PKG_SOURCE_VERSION:=c275e91392e2adab1ed22f3867b8269ca3c54014
-PKG_MIRROR_HASH:=1a4611d528f67f3acfa88aefdec9a9a67d96a3139ac5fe1089f599272e6c4a52
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FLAGS:=nonshared
+PKG_MIRROR_HASH:=4e8914340c4a08941898900500f3239762af933ff359bebcf988a10ac30b2bec
 
 include $(INCLUDE_DIR)/package.mk
 
-define fman/Default
-	TITLE:=
-	CONFIG:=
+define Package/layerscape-fman-ls1043ardb
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  TITLE:=NXP LS1043ARDB FMan ucode
+  DEPENDS:=@TARGET_layerscape
+  CONFIG:=fsl_fman_ucode_ls1043_r1.1_106_4_18.bin
 endef
 
-define fman/ls1043ardb
-	TITLE=FMAN UCODE $(PKG_NAME)-$(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
-	CONFIG=fsl_fman_ucode_ls1043_r1.1_106_4_18.bin
+define Package/layerscape-fman-ls1046ardb
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  TITLE:=NXP LS1046ARDB FMan ucode
+  DEPENDS:=@TARGET_layerscape
+  CONFIG:=fsl_fman_ucode_ls1046_r1.0_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_ls1046_r1.0_106_4_18.bin
-endef
-
-FMANS := \
-	ls1043ardb \
-	ls1046ardb
-
-define Package/fman/template
-define Package/fman-layerscape-$(1)
-	SECTION:=firmware
-	CATEGORY:=Firmware
-	DEPENDS:=@TARGET_layerscape
-	TITLE:=$(2)
-	URL:=https://github.com/qoriq-open-source/fm-ucode.git
-	VARIANT:=$(1)
-	MAINTAINER:=Jiang Yutang <jiangyutang1978@gmail.com>
-endef
-endef
-
-define BuildFMANPackage
-	$(eval $(fman/Default))
-	$(eval $(fman/$(1)))
-	$(call Package/fman/template,$(1),$(TITLE))
-endef
-
-ifdef BUILD_VARIANT
-$(eval $(call fman/$(BUILD_VARIANT)))
-FMAN_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-endif
-
 define Build/Compile
 endef
 
-define Package/fman/install/default
+define Package/layerscape-fman-ls1043ardb/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(FMAN_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-fman.bin
+	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1043ardb-fman.bin
 endef
 
-define Package/fman/install/template
-define Package/fman-layerscape-$(1)/install
-	$(call Package/fman/install/default,$(2))
-endef
+define Package/layerscape-fman-ls1046ardb/install
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1046ardb-fman.bin
 endef
 
-$(foreach f,$(FMANS), \
-	$(eval $(call Package/fman/install/template,$(f),$(f))) \
-)
-
-$(foreach f,$(FMANS), \
-	$(eval $(call BuildFMANPackage,$(f))) \
-	$(eval $(call BuildPackage,fman-layerscape-$(f))) \
-)
+$(eval $(call BuildPackage,layerscape-fman-ls1043ardb))
+$(eval $(call BuildPackage,layerscape-fman-ls1046ardb))
diff --git a/package/firmware/layerscape/ls-dpl/Makefile b/package/firmware/layerscape/ls-dpl/Makefile
index 86483cab8..c9c96400f 100644
--- a/package/firmware/layerscape/ls-dpl/Makefile
+++ b/package/firmware/layerscape/ls-dpl/Makefile
@@ -8,40 +8,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ls-dpl
-PKG_SOURCE_DATE:=2017-09-07
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/qoriq-open-source/dpl-examples.git
-PKG_SOURCE_VERSION:=a6c83759c0d9c02822eec89e86357a0998ef51d4
-PKG_MIRROR_HASH:=d0311591843fbf9faebc7e2f0d53cba47d42ef21c4407c5881f354df6c458ce5
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FLAGS:=nonshared
+PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils
+PKG_SOURCE_VERSION:=de3c46f16732f5e050851277b91e82d63818ca58
+PKG_MIRROR_HASH:=b19bba34abbb83a204ac925a18425463e508c812c43a59eafc89347fc09d5f0a
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 define Package/layerscape-dpl-ls1088ardb
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_layerscape
   TITLE:=NXP LS1088ARDB DPL firmware
-  VARIANT:=ls1088ardb
-  DPC_CONFIG:=ls1088a/RDB/dpc.0x1D-0x0D.dtb
-  DPL_CONFIG:=ls1088a/RDB/dpl-eth.0x1D_0x0D.dtb
+  DEPENDS:=@TARGET_layerscape
+  DPC_CONFIG:=config/ls1088a/RDB/dpc.0x1D-0x0D.dtb
+  DPL_CONFIG:=config/ls1088a/RDB/dpl-eth.0x1D_0x0D.dtb
 endef
 
 define Package/layerscape-dpl-ls2088ardb
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_layerscape
   TITLE:=NXP LS2088ARDB DPL firmware
-  VARIANT:=ls2088ardb
-  DPC_CONFIG:=ls2088a/RDB/dpc.0x2A_0x41.dtb
-  DPL_CONFIG:=ls2088a/RDB/dpl-eth.0x2A_0x41.dtb
+  DEPENDS:=@TARGET_layerscape
+  DPC_CONFIG:=config/ls2088a/RDB/dpc.0x2A_0x41.dtb
+  DPL_CONFIG:=config/ls2088a/RDB/dpl-eth.0x2A_0x41.dtb
 endef
 
+MAKE_PATH:=config
+MAKE_VARS+= \
+	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH)
+
 define Package/layerscape-dpl-ls1088ardb/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(CP) $(PKG_BUILD_DIR)/$(DPL_CONFIG) $(STAGING_DIR_IMAGE)/ls1088ardb-dpl.dtb
diff --git a/package/firmware/layerscape/ls-mc/Makefile b/package/firmware/layerscape/ls-mc/Makefile
index 86683d5a4..bfb624e53 100644
--- a/package/firmware/layerscape/ls-mc/Makefile
+++ b/package/firmware/layerscape/ls-mc/Makefile
@@ -8,36 +8,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ls-mc
-PKG_SOURCE_DATE:=2014-07-02
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/NXP/qoriq-mc-binary.git
-PKG_SOURCE_VERSION:=40b0c8b7edfd2d8f989619b12d6352472455c696
-PKG_MIRROR_HASH:=b3c8db70de8617e5bc033951b5ad3824f98353303870d6035668075daf93382e
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FLAGS:=nonshared
+PKG_SOURCE_VERSION:=9c1d73016b47f8654d48f0ccff776e5e4588d822
+PKG_MIRROR_HASH:=b50e98d7de3c1754fc1d5aed2cb5a10c5d3535bc609407fafbab8ecce09661fa
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/layerscape-mc-ls1088ardb
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_layerscape
   TITLE:=NXP LS1088ARDB MC firmware
-  VARIANT:=ls1088ardb
-  CONFIG:=ls1088a/mc_10.4.0_ls1088a_20171101.itb
+  DEPENDS:=@TARGET_layerscape
+  CONFIG:=ls1088a/mc_10.8.0_ls1088a_20180515.itb
 endef
 
 define Package/layerscape-mc-ls2088ardb
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_layerscape
   TITLE:=NXP LS2088ARDB MC firmware
-  VARIANT:=ls2088ardb
-  CONFIG:=ls2088a/mc_10.4.0_ls2088a_20171101.itb
+  DEPENDS:=@TARGET_layerscape
+  CONFIG:=ls2088a/mc_10.8.0_ls2088a_20180515.itb
 endef
 
 define Build/Compile
diff --git a/package/firmware/layerscape/ls-ppa/Makefile b/package/firmware/layerscape/ls-ppa/Makefile
index 89d653077..159f5ef6d 100644
--- a/package/firmware/layerscape/ls-ppa/Makefile
+++ b/package/firmware/layerscape/ls-ppa/Makefile
@@ -6,106 +6,79 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
 
 PKG_NAME:=ls-ppa
-PKG_SOURCE_DATE:=2018-01-18
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/yangbolu1991/ppa-binary.git
-PKG_SOURCE_VERSION:=cd295be24cadae51741154f3b1c935c7b9064230
-PKG_MIRROR_HASH:=743ca493f640d5fb2e99ad7b1da030f9088546f1ad70b5d1e61eb98a969c00c5
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FLAGS:=nonshared
+PKG_SOURCE_VERSION:=73ce533bed868717b891e5dbf881428f56f11b4e
+PKG_MIRROR_HASH:=d917a692197e8c3c3db6de1f8a4bc0e52dca5fc6fa84a02d68d79072cd6cbc3f
 
 include $(INCLUDE_DIR)/package.mk
 
-define ppa/Default
-	TITLE:=
-	CONFIG:=
+define Package/layerscape-ppa/Config
+  define Package/layerscape-ppa-$(1)
+    SECTION:=firmware
+    CATEGORY:=Firmware
+    TITLE:=$(2)
+    DEPENDS:=@TARGET_layerscape
+    CONFIG:=$(3)
+  endef
 endef
 
-define ppa/ls1043ardb
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls1043ardb 64b/32b Dev Board
-	CONFIG=ppa-ls1043a.itb
+define Package/layerscape-ppa/ls1012ardb
+  TITLE:=NXP LS1012ARDB PPA binary
+  CONFIG:=ppa-ls1012a.itb
 endef
 
-define ppa/ls1046ardb
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls1046ardb 64b/32b Dev Board
-	CONFIG=ppa-ls1046a.itb
+define Package/layerscape-ppa/ls1012afrwy
+  TITLE:=NXP LS1012AFRWY PPA binary
+  CONFIG:=ppa-ls1012a.itb
 endef
 
-define ppa/ls1012ardb
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls1012ardb 64b/32b Dev Board
-	CONFIG=ppa-ls1012a.itb
+define Package/layerscape-ppa/ls1043ardb
+  TITLE:=NXP LS1043ARDB PPA binary
+  CONFIG:=ppa-ls1043a.itb
 endef
 
-define ppa/ls1088ardb
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls1088ardb 64b/32b Dev Board
-	CONFIG=ppa-ls1088a.itb
+define Package/layerscape-ppa/ls1046ardb
+  TITLE:=NXP LS1046ARDB PPA binary
+  CONFIG:=ppa-ls1046a.itb
 endef
 
-define ppa/ls2088ardb
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls2088ardb 64b/32b Dev Board
-	CONFIG=ppa-ls2088a.itb
+define Package/layerscape-ppa/ls1088ardb
+  TITLE:=NXP LS1088ARDB PPA binary
+  CONFIG:=ppa-ls1088a.itb
 endef
 
-define ppa/ls1012afrdm
-	TITLE=PPA firmware $(PKG_VERSION) for NXP ls1012afrdm 64b/32b Dev Board
-	CONFIG=ppa-ls1012a.itb
+define Package/layerscape-ppa/ls2088ardb
+  TITLE:=NXP LS2088ARDB PPA binary
+  CONFIG:=ppa-ls2088a.itb
 endef
 
-PPAS := \
-	ls1043ardb \
-	ls1046ardb \
-	ls1012ardb \
-	ls1088ardb \
-	ls2088ardb \
-	ls1012afrdm
-
-define Package/ppa/template
-define Package/layerscape-ppa-$(1)
-	SECTION:=firmware
-	CATEGORY:=Firmware
-	DEPENDS:= @TARGET_layerscape
-	TITLE:=$(2)
-	VARIANT:=$(1)
-endef
-endef
-
-define BuildPPAPackage
-	$(eval $(ppa/Default))
-	$(eval $(ppa/$(1)))
-	$(call Package/ppa/template,$(1),$(TITLE))
-endef
-
-ifdef BUILD_VARIANT
-$(eval $(call ppa/$(BUILD_VARIANT)))
-PPA_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-endif
-
 define Build/Compile
 endef
 
-define Package/ppa/install/default
+define Package/layerscape-ppa/Install
+  define Package/layerscape-ppa-$(1)/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(PPA_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-ppa.itb
+	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/$(1)-ppa.itb
+  endef
 endef
 
-define Package/ppa/install/template
-define Package/layerscape-ppa-$(1)/install
-	$(call Package/ppa/install/default,$(2))
-endef
-endef
+PPAS := \
+  ls1012ardb \
+  ls1012afrwy \
+  ls1043ardb \
+  ls1046ardb \
+  ls1088ardb \
+  ls2088ardb
 
-$(foreach r,$(PPAS), \
-	$(eval $(call Package/ppa/install/template,$(r),$(r))) \
-)
-
-$(foreach r,$(PPAS), \
-	$(eval $(call BuildPPAPackage,$(r))) \
-	$(eval $(call BuildPackage,layerscape-ppa-$(r))) \
+$(foreach ppa,$(PPAS), \
+	$(eval $(Package/layerscape-ppa/$(ppa))) \
+	$(eval $(call Package/layerscape-ppa/Config,$(ppa),$(TITLE),$(CONFIG))) \
+	$(eval $(call Package/layerscape-ppa/Install,$(ppa))) \
+	$(eval $(call BuildPackage,layerscape-ppa-$(ppa))) \
 )
diff --git a/package/firmware/layerscape/ls-rcw-bin/Makefile b/package/firmware/layerscape/ls-rcw-bin/Makefile
deleted file mode 100644
index 589124e44..000000000
--- a/package/firmware/layerscape/ls-rcw-bin/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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 a3326abfb..9de68b1cc 100644
--- a/package/firmware/layerscape/ls-rcw/Makefile
+++ b/package/firmware/layerscape/ls-rcw/Makefile
@@ -6,87 +6,88 @@
 #
 
 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/ls1012afrwy
+  TITLE:=NXP LS1012AFRWY RCW binary
+  CONFIG:=ls1012afrwy/N_SSNP_3305/rcw_1000_default.bin.swapped
+endef
+
+define Package/layerscape-rcw/ls1043ardb
+  TITLE:=NXP LS1043ARDB RCW binary
+  CONFIG:=ls1043ardb/RR_FQPP_1455/rcw_1600.bin
+endef
+
+define Package/layerscape-rcw/ls1046ardb
+  TITLE:=NXP LS1046ARDB RCW binary
+  CONFIG:=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin.swapped
+endef
+
+define Package/layerscape-rcw/ls1088ardb
+  TITLE:=NXP LS1088ARDB RCW binary
+  CONFIG:=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin
+endef
+
+define Package/layerscape-rcw/ls1088ardb-sdboot
+  TITLE:=NXP LS1088ARDB SD card boot RCW binary
+  CONFIG:=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd.bin
+endef
+
+define Package/layerscape-rcw/ls2088ardb
+  TITLE:=NXP LS2088ARDB RCW binary
+  CONFIG:=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin
+endef
+
+define Package/layerscape-rcw/ls1021atwr
+  TITLE:=NXP LS1021ATWR RCW binary
+  CONFIG:=ls1021atwr/SSR_PNS_30/rcw_1200.bin
+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
 
 RCWS := \
-	ls1043ardb \
-	ls1046ardb
+  ls1012ardb \
+  ls1012afrwy \
+  ls1043ardb \
+  ls1046ardb \
+  ls1088ardb \
+  ls1088ardb-sdboot \
+  ls2088ardb \
+  ls1021atwr
 
-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
-endef
-
-define BuildRCWPackage
-	$(eval $(rcw/Default))
-	$(eval $(rcw/$(1)))
-	$(call Package/rcw/template,$(1),$(TITLE))
-endef
-
-ifdef BUILD_VARIANT
-$(eval $(call rcw/$(BUILD_VARIANT)))
-RCW_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
-endif
-
-define Build/Configure
-endef
-
-define Package/rcw/install/default
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin
-endef
-
-define Package/rcw/install/template
-define Package/rcw-layerscape-$(1)/install
-	$(call Package/rcw/install/default,$(2))
-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))) \
+$(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))) \
 )
diff --git a/package/firmware/layerscape/ls-rcw/patches/0001-rcw-add-a-python-script-for-byte-swapping.patch b/package/firmware/layerscape/ls-rcw/patches/0001-rcw-support-byte-swapping-without-tclsh-tool.patch
similarity index 50%
rename from package/firmware/layerscape/ls-rcw/patches/0001-rcw-add-a-python-script-for-byte-swapping.patch
rename to package/firmware/layerscape/ls-rcw/patches/0001-rcw-support-byte-swapping-without-tclsh-tool.patch
index a2b714065..08492dd47 100644
--- a/package/firmware/layerscape/ls-rcw/patches/0001-rcw-add-a-python-script-for-byte-swapping.patch
+++ b/package/firmware/layerscape/ls-rcw/patches/0001-rcw-support-byte-swapping-without-tclsh-tool.patch
@@ -1,31 +1,34 @@
-From ebded197f9c12168d61973043fd9ebd5d49528a8 Mon Sep 17 00:00:00 2001
+From c87a500c45f36ad248b1298d63e590d1d7e74f12 Mon Sep 17 00:00:00 2001
 From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Mon, 25 Dec 2017 14:11:02 +0800
-Subject: [PATCH] rcw: add a python script for byte swapping
+Date: Tue, 3 Jul 2018 11:06:47 +0800
+Subject: [PATCH] rcw: support byte swapping without tclsh tool
 
 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 ---
- Makefile     |  2 ++
- byte_swap.py | 32 ++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
+ Makefile     |    4 ----
+ byte_swap.py |   32 ++++++++++++++++++++++++++++++++
+ qspi_swap.sh |    2 +-
+ 3 files changed, 33 insertions(+), 5 deletions(-)
  create mode 100755 byte_swap.py
 
 diff --git a/Makefile b/Makefile
-index fb55c8b..27e3ba2 100644
+index 9f0587e..393bb2c 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -11,6 +11,8 @@ all install clean:
+@@ -13,10 +13,6 @@ TCLSH := $(shell command -v tclsh 2> /dev/null)
+ VER = $(shell git describe --tags)
+ 
+ all install clean:
+-ifndef TCLSH
+-	$(error "tclsh is not available. please  install it.")
+-	exit 1
+-endif
  	@for board in $(BOARDS); do \
  		$(MAKE) -C $$board $@ DESTDIR=$(DESTDIR)/$$board; \
  	done
-+	chmod 755 ./byte_swap.py; \
-+	./byte_swap.py ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin 8
- 
- release: $(foreach board,$(BOARDS),rcw-$(board)-$(VER).tar.gz)
- 
 diff --git a/byte_swap.py b/byte_swap.py
 new file mode 100755
-index 0000000..7ee4129
+index 0000000..386310e
 --- /dev/null
 +++ b/byte_swap.py
 @@ -0,0 +1,32 @@
@@ -51,7 +54,7 @@ index 0000000..7ee4129
 +    tmp = file.read()
 +file.close()
 +
-+with open(file_name + '.swap','wb') as file:
++with open(file_name + '.swapped','wb') as file:
 +    for i in range(0, len(tmp) - 1, byte):
 +	if(tmp[i:i+4].encode('hex')) == "08610040":
 +	    #print("PBI CRC command")
@@ -60,7 +63,20 @@ index 0000000..7ee4129
 +	file.write(tmp[i:i+byte][::-1])
 +file.close()
 +
-+print("Swapped file: " + file_name + '.swap')
++print("Swapped file: " + file_name + '.swapped')
+diff --git a/qspi_swap.sh b/qspi_swap.sh
+index 0b58e44..d23fd8b 100755
+--- a/qspi_swap.sh
++++ b/qspi_swap.sh
+@@ -9,7 +9,7 @@ do
+ 	if [ "$board_name" = "$current_dir" ]; then
+ 		if [ -e $filename ]; then
+ 			swapped_file="$filename.swapped"
+-			tclsh ../tools/byte_swap.tcl $filename $swapped_file 8
++			../byte_swap.py $filename 8
+ 		fi
+ 	fi
+ done < $1
 -- 
-2.7.4
+1.7.1
 
diff --git a/package/firmware/layerscape/ppfe-firmware/Makefile b/package/firmware/layerscape/ppfe-firmware/Makefile
index dc73f9397..3909b0630 100644
--- a/package/firmware/layerscape/ppfe-firmware/Makefile
+++ b/package/firmware/layerscape/ppfe-firmware/Makefile
@@ -8,15 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ppfe
-PKG_SOURCE_DATE:=2017-12-05
+PKG_VERSION:=lsdk-1806
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/NXP/qoriq-engine-pfe-bin.git
-PKG_SOURCE_VERSION:=848002fe4e0e3efb8d13a813e5c123bbc87aa95b
-PKG_MIRROR_HASH:=b6867be2f5826e807db15256996e11303ca7bbe06ac18448cbf68827d9a59ae2
-
-PKG_FLAGS:=nonshared
+PKG_SOURCE_VERSION:=50c825b9300c5e36548fb5dcbef538b650fc1913
+PKG_MIRROR_HASH:=7627ce260ac4b320f3a7e8ad81db1c3ec2266332762dd1e4313480f7a678fd43
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,8 +24,8 @@ STRIP:=:
 define Package/layerscape-ppfe
   SECTION:=firmware
   CATEGORY:=Firmware
-  DEPENDS:=@TARGET_layerscape
   TITLE:=NXP Layerscape PPFE firmware
+  DEPENDS:=@TARGET_layerscape
   CONFIG_FW:=ls1012a/u-boot/pfe_fw_sbl.itb
   CONFIG_BIN1:=ls1012a/slow_path/ppfe_class_ls1012a.elf
   CONFIG_BIN2:=ls1012a/slow_path/ppfe_tmu_ls1012a.elf