KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

image: clean up UBI related device variable definitions

Browse source 
Move UBI related variable export to core, since the variables are used
by a core Build/ template

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-13 17:19:00 +02:00
parent 1729a089fe
commit e0ed6ec667
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/image.mk
View file

@ -322,15 +322,26 @@ define Device/Init
KERNEL_DEPENDS := KERNEL_DEPENDS :=
KERNEL_SIZE := KERNEL_SIZE :=
UBOOTENV_IN_UBI :=
KERNEL_IN_UBI :=
BLOCKSIZE :=
PAGESIZE :=
SUBPAGESIZE :=
FILESYSTEMS := $(TARGET_FILESYSTEMS) FILESYSTEMS := $(TARGET_FILESYSTEMS)
endef endef
DEFAULT_DEVICE_VARS := \
DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \
UBOOTENV_IN_UBI KERNEL_IN_UBI \
BLOCKSIZE PAGESIZE SUBPAGESIZE
define Device/ExportVar define Device/ExportVar
$(1) : $(2):=$$($(2)) $(1) : $(2):=$$($(2))
endef endef
define Device/Export define Device/Export
$(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE,$(call Device/ExportVar,$(1),$(var))) $(foreach var,$(DEVICE_VARS) $(DEFAULT_DEVICE_VARS),$(call Device/ExportVar,$(1),$(var)))
$(1) : FILESYSTEM:=$(2) $(1) : FILESYSTEM:=$(2)
endef endef

6
target/linux/ipq806x/image/Makefile
View file

@ -45,7 +45,7 @@ define Device/Default
KERNEL_IN_UBI := KERNEL_IN_UBI :=
BOARD_NAME := BOARD_NAME :=
endef endef
DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI BOARD_NAME DEVICE_VARS += DEVICE_DTS BOARD_NAME KERNEL_SIZE
define Device/LegacyImage define Device/LegacyImage
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage
@ -79,7 +79,7 @@ define Device/DniImage
IMAGE/factory.img := append-kernel | append-ubi | netgear-dni IMAGE/factory.img := append-kernel | append-ubi | netgear-dni
IMAGE/sysupgrade.tar = sysupgrade-nand IMAGE/sysupgrade.tar = sysupgrade-nand
endef endef
DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Device/TpSafeImage define Device/TpSafeImage
PROFILES += $$(DEVICE_NAME) PROFILES += $$(DEVICE_NAME)
@ -162,10 +162,10 @@ define Device/EA8500
IMAGES := factory.bin sysupgrade.tar IMAGES := factory.bin sysupgrade.tar
IMAGE/factory.bin := append-kernel 3145728 | append-ubi IMAGE/factory.bin := append-kernel 3145728 | append-ubi
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-nand
DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
DEVICE_TITLE := Linksys EA8500 DEVICE_TITLE := Linksys EA8500
DEVICE_PACKAGES := ath10k-firmware-qca99x0 DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef endef
DEVICE_VARS += DEVICE_DTS
define Device/R7500 define Device/R7500
$(call Device/DniImage) $(call Device/DniImage)

2
target/linux/kirkwood/image/Makefile
View file

@ -10,7 +10,7 @@ NAND_BLOCKSIZE := 2048-128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE KERNEL_IN_UBI DEVICE_VARS += DEVICE_DTS KERNEL_SIZE
KERNEL_LOADADDR:=0x8000 KERNEL_LOADADDR:=0x8000
TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome

3
target/linux/oxnas/image/Makefile
View file

@ -10,8 +10,7 @@ include $(INCLUDE_DIR)/image.mk
UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
DEVICE_VARS += DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE DEVICE_VARS += DTS KERNEL_SIZE UBIFS_OPTS
DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS
KERNEL_LOADADDR := 0x60008000 KERNEL_LOADADDR := 0x60008000