aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-03-14 14:32:39 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commit70a6a9814918e4885317e8e0bd7112e65a545873 (patch)
treebce637830ebccf31150a09b514f75f58924dae85
parentb7820d57dbbae8d960a1142319134b3b67739314 (diff)
downloadupstream-70a6a9814918e4885317e8e0bd7112e65a545873.tar.gz
upstream-70a6a9814918e4885317e8e0bd7112e65a545873.tar.bz2
upstream-70a6a9814918e4885317e8e0bd7112e65a545873.zip
layerscape: define only one package for ls-dpl
We do not have to define package for each board, and consider variant's installing. It is easier to maintain ls-dpl with only one package installing all 4 files as intermediate files. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
-rw-r--r--package/firmware/layerscape/ls-dpl/Makefile36
-rw-r--r--target/linux/layerscape/image/armv8_64b.mk6
2 files changed, 15 insertions, 27 deletions
diff --git a/package/firmware/layerscape/ls-dpl/Makefile b/package/firmware/layerscape/ls-dpl/Makefile
index 8d2ab965c6..b54a4da189 100644
--- a/package/firmware/layerscape/ls-dpl/Makefile
+++ b/package/firmware/layerscape/ls-dpl/Makefile
@@ -19,39 +19,27 @@ PKG_MIRROR_HASH:=e96e72793fb9fea1d4f5112d318059ea4c836d65c02852d207407edf13fc92a
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
- $(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
-endef
-
-define Package/layerscape-dpl-ls2088ardb/install
+define Build/InstallDev
$(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
+ $(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
-$(eval $(call BuildPackage,layerscape-dpl-ls1088ardb))
-$(eval $(call BuildPackage,layerscape-dpl-ls2088ardb))
+$(eval $(call BuildPackage,layerscape-dpl))
diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index c981da356c..ffc8346d24 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -192,7 +192,7 @@ define Device/ls1088ardb
DEVICE_VARIANT := Default
DEVICE_PACKAGES += \
layerscape-mc \
- layerscape-dpl-ls1088ardb \
+ layerscape-dpl \
tfa-ls1088ardb \
restool
DEVICE_DTS := freescale/fsl-ls1088a-rdb
@@ -219,7 +219,7 @@ define Device/ls1088ardb-sdboot
DEVICE_VARIANT := SD Card Boot
DEVICE_PACKAGES += \
layerscape-mc \
- layerscape-dpl-ls1088ardb \
+ layerscape-dpl \
tfa-ls1088ardb-sdboot \
restool
DEVICE_DTS := freescale/fsl-ls1088a-rdb
@@ -245,7 +245,7 @@ define Device/ls2088ardb
DEVICE_MODEL := LS2088ARDB
DEVICE_PACKAGES += \
layerscape-mc \
- layerscape-dpl-ls2088ardb \
+ layerscape-dpl \
tfa-ls2088ardb \
restool
DEVICE_DTS := freescale/fsl-ls2088a-rdb