From 6c9d8990a41f185d457ae75361572ebab7958ab5 Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Sat, 14 Mar 2020 14:11:12 +0800
Subject: [PATCH] layerscape: define only one package for fman-ucode

We do not have to define package for each board, and
consider variant's installing.
It is easier to maintain fman-ucode with only one package
installing all two binaries as intermediate files.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 .../firmware/layerscape/fman-ucode/Makefile   | 28 ++++++-------------
 target/linux/layerscape/image/armv8_64b.mk    | 10 +++----
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile
index 9561fbc0b36..fecd11989a0 100644
--- a/package/firmware/layerscape/fman-ucode/Makefile
+++ b/package/firmware/layerscape/fman-ucode/Makefile
@@ -18,34 +18,22 @@ PKG_MIRROR_HASH:=a630f1a86e4a67a0e390312291702560e3f64dd74fe6ccb8f3be4584d00c7f8
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/layerscape-fman-ls1043ardb
+define Package/layerscape-fman
   SECTION:=firmware
   CATEGORY:=Firmware
-  TITLE:=NXP LS1043ARDB FMan ucode
+  TITLE:=NXP FMan ucode
   DEPENDS:=@TARGET_layerscape
-  CONFIG:=fsl_fman_ucode_ls1043_r1.1_106_4_18.bin
-endef
-
-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 Build/Compile
 endef
 
-define Package/layerscape-fman-ls1043ardb/install
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1043ardb-fman.bin
-endef
-
-define Package/layerscape-fman-ls1046ardb/install
+define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1046ardb-fman.bin
+	$(CP) $(PKG_BUILD_DIR)/fsl_fman_ucode_ls1043_r1.1_106_4_18.bin \
+		$(STAGING_DIR_IMAGE)/ls1043ardb-fman.bin
+	$(CP) $(PKG_BUILD_DIR)/fsl_fman_ucode_ls1046_r1.0_106_4_18.bin \
+		$(STAGING_DIR_IMAGE)/ls1046ardb-fman.bin
 endef
 
-$(eval $(call BuildPackage,layerscape-fman-ls1043ardb))
-$(eval $(call BuildPackage,layerscape-fman-ls1046ardb))
+$(eval $(call BuildPackage,layerscape-fman))
diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index e84ee5bd32f..a5458dc2097 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -97,7 +97,7 @@ define Device/ls1043ardb
   DEVICE_MODEL := LS1043A-RDB
   DEVICE_VARIANT := Default
   DEVICE_PACKAGES += \
-    layerscape-fman-ls1043ardb \
+    layerscape-fman \
     tfa-ls1043ardb \
     fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk
@@ -119,7 +119,7 @@ define Device/ls1043ardb-sdboot
   DEVICE_MODEL := LS1043A-RDB
   DEVICE_VARIANT := SD Card Boot
   DEVICE_PACKAGES += \
-    layerscape-fman-ls1043ardb \
+    layerscape-fman \
     tfa-ls1043ardb-sdboot \
     fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk
@@ -143,7 +143,7 @@ define Device/ls1046ardb
   DEVICE_MODEL := LS1046A-RDB
   DEVICE_VARIANT := Default
   DEVICE_PACKAGES += \
-    layerscape-fman-ls1046ardb \
+    layerscape-fman \
     tfa-ls1046ardb \
     fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
@@ -167,7 +167,7 @@ define Device/ls1046ardb-sdboot
   DEVICE_MODEL := LS1046A-RDB
   DEVICE_VARIANT := SD Card Boot
   DEVICE_PACKAGES += \
-    layerscape-fman-ls1046ardb \
+    layerscape-fman \
     tfa-ls1046ardb-sdboot \
     fmc fmc-eth-config
   DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk
@@ -273,7 +273,7 @@ define Device/traverse-ls1043
   FDT_LOADADDR = 0x90000000
   FILESYSTEMS := ubifs
   DEVICE_PACKAGES += \
-    layerscape-fman-ls1043ardb \
+    layerscape-fman \
     uboot-envtools \
     kmod-i2c-mux-pca954x \
     kmod-hwmon-core \
-- 
2.30.2