Skip to content

Commit

Permalink
layerscape: define only one package for ls-dpl
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yangbolu1991 authored and ynezz committed May 7, 2020
1 parent b7820d5 commit 70a6a98
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 27 deletions.
36 changes: 12 additions & 24 deletions package/firmware/layerscape/ls-dpl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))
6 changes: 3 additions & 3 deletions target/linux/layerscape/image/armv8_64b.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 70a6a98

Please sign in to comment.