Author: jogo Date: 2015-08-14 15:05:22 +0200 (Fri, 14 Aug 2015) New Revision: 46597
Modified: trunk/include/image.mk trunk/target/linux/brcm2708/image/Makefile trunk/target/linux/brcm63xx/image/Makefile Log: image.mk: store the device name variable Make the device name accessible for any build commands instead of forcing targets to define it themselves. Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2015-08-14 13:05:14 UTC (rev 46596) +++ trunk/include/image.mk 2015-08-14 13:05:22 UTC (rev 46597) @@ -367,6 +367,7 @@ define Device/Init PROFILES := $(PROFILE) + DEVICE_NAME := $(1) KERNEL:= KERNEL_INITRAMFS = $$(KERNEL) KERNEL_SIZE:= @@ -391,7 +392,7 @@ endef define Device/Export - $(foreach var,$(DEVICE_VARS) KERNEL KERNEL_INITRAMFS,$(call Device/ExportVar,$(1),$(var))) + $(foreach var,$(DEVICE_VARS) DEVICE_NAME KERNEL KERNEL_INITRAMFS,$(call Device/ExportVar,$(1),$(var))) $(1) : FILESYSTEM:=$(2) endef Modified: trunk/target/linux/brcm2708/image/Makefile =================================================================== --- trunk/target/linux/brcm2708/image/Makefile 2015-08-14 13:05:14 UTC (rev 46596) +++ trunk/target/linux/brcm2708/image/Makefile 2015-08-14 13:05:22 UTC (rev 46597) @@ -61,10 +61,9 @@ IMAGES := sdcard.bin IMAGE/sdcard.bin := build-dtb | gen-cfg | boot-img | sdcard-img DEVICE_PROFILE := - DEVICE_NAME := DEVICE_DTS := endef -DEVICE_VARS += DEVICE_PROFILE DEVICE_NAME DEVICE_DTS +DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS # $(1) = profile # $(2) = image name @@ -72,7 +71,6 @@ define add_bcm2708 define Device/$(2) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) endef TARGET_DEVICES += $(2) Modified: trunk/target/linux/brcm63xx/image/Makefile =================================================================== --- trunk/target/linux/brcm63xx/image/Makefile 2015-08-14 13:05:14 UTC (rev 46596) +++ trunk/target/linux/brcm63xx/image/Makefile 2015-08-14 13:05:22 UTC (rev 46597) @@ -175,10 +175,9 @@ PROFILES = Default $$(DEVICE_PROFILE) KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX).elf DEVICE_PROFILE := - DEVICE_NAME := DEVICE_DTS := endef -DEVICE_VARS += DEVICE_PROFILE DEVICE_NAME DEVICE_DTS +DEVICE_VARS += DEVICE_PROFILE DEVICE_DTS # BCM33xx HCS devices: only generates ramdisks (unsupported bin images) define Device/bcm33xxHcsRamdisk @@ -313,7 +312,6 @@ define Device/$(2) $$(Device/bcm33xxHcsRamdisk) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) HCS_MAGIC_BYTES := $(4) HCS_REV_MIN := $(5) @@ -329,7 +327,6 @@ define Device/$(2) $$(Device/bcm63xxCfeRamdisk) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) endef TARGET_DEVICES += $(2) @@ -345,7 +342,6 @@ define Device/$(2) $$(Device/bcm63xxCfe) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -364,7 +360,6 @@ define Device/$(2) $$(Device/bcm63xxCfeMultiFlash) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -383,7 +378,6 @@ define Device/$(2) $$(Device/bcm63xxCfeBc221) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -404,7 +398,6 @@ define Device/$(2) $$(Device/bcm63xxCfeNetgear) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -425,7 +418,6 @@ define Device/$(2) $$(Device/bcm63xxCfeOld) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -444,7 +436,6 @@ define Device/$(2) $$(Device/bcm63xxCfeSpw303v) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -463,7 +454,6 @@ define Device/$(2) $$(Device/bcm63xxCfeZyxel) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) CFE_BOARD_ID := $(4) CFE_CHIP_ID := $(5) @@ -479,7 +469,6 @@ define Device/$(2) $$(Device/bcm63xxRedBoot) DEVICE_PROFILE := $(1) - DEVICE_NAME := $(2) DEVICE_DTS := $(3) endef TARGET_DEVICES += $(2) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
