gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mvebu: move subtarget image Makefile switch to parent Makefile

Browse Source 
This moves the if conditions for choosing which image Makefiles
are used to the parent image/Makefile. It seems more convenient
to have "codeflow" in the parent while the subtarget-specific
files only contain the definitions.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
This commit is contained in:
Adrian Schmutzler 2020-01-18 02:21:11 +01:00
parent b99b60b2f1
commit 0a388b5bf7
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/mvebu/image/Makefile
View File

@ -116,8 +116,16 @@ define Device/NAND-512K
PAGESIZE := 4096 PAGESIZE := 4096
endef endef
ifeq ($(SUBTARGET),cortexa9)
include cortex-a9.mk include cortex-a9.mk
endif
ifeq ($(SUBTARGET),cortexa53)
include cortex-a53.mk include cortex-a53.mk
endif
ifeq ($(SUBTARGET),cortexa72)
include cortex-a72.mk include cortex-a72.mk
endif
$(eval $(call BuildImage)) $(eval $(call BuildImage))

4
target/linux/mvebu/image/cortex-a53.mk
View File

@ -1,5 +1,3 @@
ifeq ($(SUBTARGET),cortexa53)
define Device/globalscale_espressobin define Device/globalscale_espressobin
$(call Device/Default-arm64) $(call Device/Default-arm64)
DEVICE_VENDOR := Marvell DEVICE_VENDOR := Marvell
@ -73,5 +71,3 @@ define Device/methode_udpu
BOOT_SCRIPT := udpu BOOT_SCRIPT := udpu
endef endef
TARGET_DEVICES += methode_udpu TARGET_DEVICES += methode_udpu
endif

4
target/linux/mvebu/image/cortex-a72.mk
View File

@ -1,5 +1,3 @@
ifeq ($(SUBTARGET),cortexa72)
define Device/marvell_macchiatobin define Device/marvell_macchiatobin
$(call Device/Default-arm64) $(call Device/Default-arm64)
DEVICE_VENDOR := SolidRun DEVICE_VENDOR := SolidRun
@ -29,5 +27,3 @@ define Device/marvell_armada7040-db
IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
endef endef
TARGET_DEVICES += marvell_armada7040-db TARGET_DEVICES += marvell_armada7040-db
endif

4
target/linux/mvebu/image/cortex-a9.mk
View File

@ -6,8 +6,6 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
ifeq ($(SUBTARGET),cortexa9)
define Device/linksys define Device/linksys
$(Device/NAND-128K) $(Device/NAND-128K)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
@ -218,5 +216,3 @@ define Device/cznic_turris-omnia
SUPPORTED_DEVICES += armada-385-turris-omnia SUPPORTED_DEVICES += armada-385-turris-omnia
endef endef
TARGET_DEVICES += cznic_turris-omnia TARGET_DEVICES += cznic_turris-omnia
endif