From 56853409c4f6ba038aea8d12f7702b44ef866e0f Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 29 Jun 2018 16:20:32 +0800 Subject: [PATCH] layerscape: update fman-ucode to LSDK-18.06 Actually there was no change for fman-ucode in LSDK-18.06 just tagged with LSDK-18.06. This patch is to rework the fman-ucode makefile to make it more readable, and to use lsdk-1806 as the PKG_VERSION. Signed-off-by: Yangbo Lu --- .../firmware/layerscape/fman-ucode/Makefile | 80 +++++-------------- target/linux/layerscape/image/Makefile | 6 +- 2 files changed, 24 insertions(+), 62 deletions(-) diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile index 495aee99e7b..f211f83de88 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:= -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 -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 -endef +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 BuildFMANPackage - $(eval $(fman/Default)) - $(eval $(fman/$(1))) - $(call Package/fman/template,$(1),$(TITLE)) +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 -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/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile index 8e1e847f592..046f6d7bebe 100644 --- a/target/linux/layerscape/image/Makefile +++ b/target/linux/layerscape/image/Makefile @@ -80,7 +80,7 @@ endef define Device/ls1043ardb DEVICE_TITLE := ls1043ardb-$(SUBTARGET) DEVICE_PACKAGES += rcw-layerscape-ls1043ardb uboot-layerscape-$(SUBTARGET)-ls1043ardb \ - fman-layerscape-ls1043ardb layerscape-ppa-ls1043ardb + layerscape-fman-ls1043ardb layerscape-ppa-ls1043ardb DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1043a-rdb-sdk IMAGE/firmware.bin = append-ls-rcw $(1) | pad-to 1M | \ append-ls-uboot $(1) | pad-to 4M | \ @@ -95,7 +95,7 @@ TARGET_DEVICES += ls1043ardb define Device/ls1046ardb DEVICE_TITLE := ls1046ardb-$(SUBTARGET) DEVICE_PACKAGES += rcw-layerscape-ls1046ardb uboot-layerscape-$(SUBTARGET)-ls1046ardb \ - fman-layerscape-ls1046ardb layerscape-ppa-ls1046ardb + layerscape-fman-ls1046ardb layerscape-ppa-ls1046ardb DEVICE_DTS = ../../../arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk FILESYSTEMS := ubifs UBIFS_OPTS := -m 1 -e 262016 -c 128 @@ -201,7 +201,7 @@ define Device/traverse-five64 KERNEL_INSTALL := 1 FILESYSTEMS := ubifs DEVICE_TITLE := Traverse LS1043 Boards (Five64, LS1043S) - DEVICE_PACKAGES += fman-layerscape-ls1043ardb kmod-i2c-core kmod-rtc-isl1208 uboot-envtools \ + DEVICE_PACKAGES += layerscape-fman-ls1043ardb kmod-i2c-core kmod-rtc-isl1208 uboot-envtools \ uboot-traverse-ls1043v uboot-traverse-ls1043v-sdcard \ kmod-hwmon-core kmod-hwmon-ltc2990 kmod-gpio-pca953x kmod-input-gpio-keys-polled \ kmod-i2c-mux-pca954x kmod-hwmon-pac1934 kmod-hwmon-emc17xx -- 2.30.2