fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: simplify inclusion of subtarget image files

Browse Source 
Many target use a repetitive if-include scheme for their subtarget
image files, though their names are consistent with the subtarget
names.

This patch removes these redundant conditions and just uses the
variable for the include where the target setup allows it.

For sunxi, this includes a trivial rename of the subtarget image
Makefiles.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-06-07 13:11:15 +02:00 committed by AmadeusGhost
parent 9ce97902e7
commit 0d32423daf
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,12 +46,6 @@ define Build/traverse-fit
@mv -f $@.new $@
endef
ifeq ($(SUBTARGET),armv8_64b)
include armv8_64b.mk
endif
ifeq ($(SUBTARGET),armv7)
include armv7.mk
endif
include $(SUBTARGET).mk
$(eval $(call BuildImage))

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

@ -4,12 +4,6 @@ include $(INCLUDE_DIR)/image.mk
VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
ifeq ($(SUBTARGET),ox810se)
include ox810se.mk
endif
ifeq ($(SUBTARGET),ox820)
include ox820.mk
endif
include $(SUBTARGET).mk
$(eval $(call BuildImage))