diff options
| -rw-r--r-- | include/image.mk | 13 | ||||
| -rw-r--r-- | target/linux/ipq806x/image/Makefile | 6 | ||||
| -rw-r--r-- | target/linux/kirkwood/image/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/oxnas/image/Makefile | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/include/image.mk b/include/image.mk index a47d588488..a1e00df716 100644 --- a/include/image.mk +++ b/include/image.mk @@ -322,15 +322,26 @@ define Device/Init KERNEL_DEPENDS := KERNEL_SIZE := + UBOOTENV_IN_UBI := + KERNEL_IN_UBI := + BLOCKSIZE := + PAGESIZE := + SUBPAGESIZE := + FILESYSTEMS := $(TARGET_FILESYSTEMS) endef +DEFAULT_DEVICE_VARS := \ + DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE \ + UBOOTENV_IN_UBI KERNEL_IN_UBI \ + BLOCKSIZE PAGESIZE SUBPAGESIZE + define Device/ExportVar $(1) : $(2):=$$($(2)) endef 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) endef diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index ace3c88977..0b7c9ef9a0 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -45,7 +45,7 @@ define Device/Default KERNEL_IN_UBI := BOARD_NAME := endef -DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI BOARD_NAME +DEVICE_VARS += DEVICE_DTS BOARD_NAME KERNEL_SIZE define Device/LegacyImage KERNEL_SUFFIX := -uImage @@ -79,7 +79,7 @@ define Device/DniImage IMAGE/factory.img := append-kernel | append-ubi | netgear-dni IMAGE/sysupgrade.tar = sysupgrade-nand 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 PROFILES += $$(DEVICE_NAME) @@ -162,10 +162,10 @@ define Device/EA8500 IMAGES := factory.bin sysupgrade.tar IMAGE/factory.bin := append-kernel 3145728 | append-ubi IMAGE/sysupgrade.tar := sysupgrade-nand - DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE DEVICE_TITLE := Linksys EA8500 DEVICE_PACKAGES := ath10k-firmware-qca99x0 endef +DEVICE_VARS += DEVICE_DTS define Device/R7500 $(call Device/DniImage) diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 1a36bf4500..0c95dd3d6d 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -10,7 +10,7 @@ NAND_BLOCKSIZE := 2048-128k include $(TOPDIR)/rules.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 TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile index 42bbbc826e..3eb1212a74 100644 --- a/target/linux/oxnas/image/Makefile +++ b/target/linux/oxnas/image/Makefile @@ -10,8 +10,7 @@ include $(INCLUDE_DIR)/image.mk UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 -DEVICE_VARS += DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE -DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS +DEVICE_VARS += DTS KERNEL_SIZE UBIFS_OPTS KERNEL_LOADADDR := 0x60008000 |