From aa98d54c16167fb3d642e98db57a46d1b423e6e3 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Wed, 11 Mar 2020 18:01:29 +0800 Subject: [PATCH] layerscape: update firmware to LSDK-20.04 Update firmware to latest LSDK-20.04. Signed-off-by: Yangbo Lu --- .../firmware/layerscape/fman-ucode/Makefile | 32 +++++--------- package/firmware/layerscape/ls-dpl/Makefile | 42 +++++++------------ package/firmware/layerscape/ls-mc/Makefile | 34 +++++---------- .../layerscape/ppfe-firmware/Makefile | 6 +-- 4 files changed, 39 insertions(+), 75 deletions(-) diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile index 9561fbc0b3..ba1dcf9160 100644 --- a/package/firmware/layerscape/fman-ucode/Makefile +++ b/package/firmware/layerscape/fman-ucode/Makefile @@ -8,44 +8,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fman-ucode -PKG_VERSION:=lsdk-1903 +PKG_VERSION:=LSDK-20.04 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:=a630f1a86e4a67a0e390312291702560e3f64dd74fe6ccb8f3be4584d00c7f80 +PKG_MIRROR_HASH:=90b619ed501462b92f34f2fabfa09d6aaa5235990891d1c3132821c7d18a39bd 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 +define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1043ardb-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 -define Package/layerscape-fman-ls1046ardb/install - $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(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/package/firmware/layerscape/ls-dpl/Makefile b/package/firmware/layerscape/ls-dpl/Makefile index 8d2ab965c6..89238dce36 100644 --- a/package/firmware/layerscape/ls-dpl/Makefile +++ b/package/firmware/layerscape/ls-dpl/Makefile @@ -8,50 +8,38 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-dpl -PKG_VERSION:=lsdk-1903 +PKG_VERSION:=LSDK-20.04 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils -PKG_SOURCE_VERSION:=eeb8972a3d4137c87a54c2795452b17f254a68c7 -PKG_MIRROR_HASH:=e96e72793fb9fea1d4f5112d318059ea4c836d65c02852d207407edf13fc92af +PKG_SOURCE_VERSION:=8672a5f5abcd3a354dcab07e03f2a8a69b2e962d +PKG_MIRROR_HASH:=4b8ad3148aee1e0c034206543472aebb435655fd03a661c4c1be545dcac7ddf0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk -define Package/layerscape-dpl-ls1088ardb +define Package/layerscape-dpl SECTION:=firmware CATEGORY:=Firmware - TITLE:=NXP LS1088ARDB DPL firmware + TITLE:=NXP DPL firmware 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 - TITLE:=NXP LS2088ARDB DPL firmware - 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 +define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(DPL_CONFIG) $(STAGING_DIR_IMAGE)/ls1088ardb-dpl.dtb - $(CP) $(PKG_BUILD_DIR)/$(DPC_CONFIG) $(STAGING_DIR_IMAGE)/ls1088ardb-dpc.dtb + $(CP) $(PKG_BUILD_DIR)/config/ls1088a/RDB/dpl-eth.0x1D_0x0D.dtb \ + $(STAGING_DIR_IMAGE)/ls1088ardb-dpl.dtb + $(CP) $(PKG_BUILD_DIR)/config/ls1088a/RDB/dpc.0x1D-0x0D.dtb \ + $(STAGING_DIR_IMAGE)/ls1088ardb-dpc.dtb + $(CP) $(PKG_BUILD_DIR)/config/ls2088a/RDB/dpl-eth.0x2A_0x41.dtb \ + $(STAGING_DIR_IMAGE)/ls2088ardb-dpl.dtb + $(CP) $(PKG_BUILD_DIR)/config/ls2088a/RDB/dpc.0x2A_0x41.dtb \ + $(STAGING_DIR_IMAGE)/ls2088ardb-dpc.dtb endef -define Package/layerscape-dpl-ls2088ardb/install - $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(DPL_CONFIG) $(STAGING_DIR_IMAGE)/ls2088ardb-dpl.dtb - $(CP) $(PKG_BUILD_DIR)/$(DPC_CONFIG) $(STAGING_DIR_IMAGE)/ls2088ardb-dpc.dtb -endef - -$(eval $(call BuildPackage,layerscape-dpl-ls1088ardb)) -$(eval $(call BuildPackage,layerscape-dpl-ls2088ardb)) +$(eval $(call BuildPackage,layerscape-dpl)) diff --git a/package/firmware/layerscape/ls-mc/Makefile b/package/firmware/layerscape/ls-mc/Makefile index 657b3b33b7..d7b88e01a2 100644 --- a/package/firmware/layerscape/ls-mc/Makefile +++ b/package/firmware/layerscape/ls-mc/Makefile @@ -8,44 +8,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-mc -PKG_VERSION:=lsdk-1903 +PKG_VERSION:=LSDK-20.04 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NXP/qoriq-mc-binary.git -PKG_SOURCE_VERSION:=bd64d1824681b009fd83b0a3699e45b117b72695 -PKG_MIRROR_HASH:=17ecfd780b8d884b3843d2b8fbcaf29410fdacdc03ab3fe81ae7ade994d7fc0a +PKG_SOURCE_VERSION:=f73683596a7b72124d67b62e64f3dc2bb36b9321 +PKG_MIRROR_HASH:=1cba30c2a6814763c3e155c1cc5fa21998bb6ad5814fcb09e99f98bf36f65d9e include $(INCLUDE_DIR)/package.mk -define Package/layerscape-mc-ls1088ardb +define Package/layerscape-mc SECTION:=firmware CATEGORY:=Firmware - TITLE:=NXP LS1088ARDB MC firmware + TITLE:=NXP MC firmware DEPENDS:=@TARGET_layerscape - CONFIG:=ls1088a/mc_10.14.3_ls1088a.itb -endef - -define Package/layerscape-mc-ls2088ardb - SECTION:=firmware - CATEGORY:=Firmware - TITLE:=NXP LS2088ARDB MC firmware - DEPENDS:=@TARGET_layerscape - CONFIG:=ls2088a/mc_10.14.3_ls2088a.itb endef define Build/Compile endef -define Package/layerscape-mc-ls1088ardb/install +define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls1088ardb-mc.itb + $(CP) $(PKG_BUILD_DIR)/ls1088a/mc_10.20.4_ls1088a.itb \ + $(STAGING_DIR_IMAGE)/ls1088ardb-mc.itb + $(CP) $(PKG_BUILD_DIR)/ls2088a/mc_10.20.4_ls2088a.itb \ + $(STAGING_DIR_IMAGE)/ls2088ardb-mc.itb endef -define Package/layerscape-mc-ls2088ardb/install - $(INSTALL_DIR) $(STAGING_DIR_IMAGE) - $(CP) $(PKG_BUILD_DIR)/$(CONFIG) $(STAGING_DIR_IMAGE)/ls2088ardb-mc.itb -endef - -$(eval $(call BuildPackage,layerscape-mc-ls1088ardb)) -$(eval $(call BuildPackage,layerscape-mc-ls2088ardb)) +$(eval $(call BuildPackage,layerscape-mc)) diff --git a/package/firmware/layerscape/ppfe-firmware/Makefile b/package/firmware/layerscape/ppfe-firmware/Makefile index 662fa23734..14ceb0218b 100644 --- a/package/firmware/layerscape/ppfe-firmware/Makefile +++ b/package/firmware/layerscape/ppfe-firmware/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ppfe -PKG_VERSION:=lsdk-1903 +PKG_VERSION:=LSDK-20.04 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NXP/qoriq-engine-pfe-bin.git -PKG_SOURCE_VERSION:=58aa0cac630528ed91fe5639700d6b571c0c07b5 -PKG_MIRROR_HASH:=1234a86e879f2eecd3ac4852bb39e4189b03bb659bec228a1d1ccae5ac0229e6 +PKG_SOURCE_VERSION:=d3a8ef0760c54ddc243039c86389497e37be90ab +PKG_MIRROR_HASH:=64be93b8249d298e7b5fd0846787835f0659b6ab6c55b40b809366c79e272eb8 include $(INCLUDE_DIR)/package.mk