ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

treewide: gather DEVICE_VARS into one place

Browse Source 
Place DEVICE_VARS assignments at the top of the file or above Device/Default
to make them easier to find.

For ramips, remove redundant values already present in parent file.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
[do not touch ar71xx, extend commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Sungbo Eo 2020-03-10 15:41:09 +09:00 committed by Adrian Schmutzler
parent d5812478ad
commit 5b392c7119
11 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/ath79/image/nand.mk
View File

@ -1,5 +1,7 @@
include ./common-netgear.mk # for netgear-uImage include ./common-netgear.mk # for netgear-uImage
DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION
# attention: only zlib compression is allowed for the boot fs # attention: only zlib compression is allowed for the boot fs
define Build/zyxel-buildkerneljffs define Build/zyxel-buildkerneljffs
rm -rf $(KDIR_TMP)/zyxelnbg6716 rm -rf $(KDIR_TMP)/zyxelnbg6716
@ -216,4 +218,3 @@ define Device/zyxel_nbg6716
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
endef endef
TARGET_DEVICES += zyxel_nbg6716 TARGET_DEVICES += zyxel_nbg6716
DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION

11
target/linux/bcm63xx/image/bcm63xx.mk
View File

@ -3,6 +3,12 @@
# BCM33XX/BCM63XX Profiles # BCM33XX/BCM63XX Profiles
# #
DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ
DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET
DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
DEVICE_VARS += REDBOOT_PREFIX
define Device/bcm33xx define Device/bcm33xx
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma bin | hcs-initramfs
IMAGES := IMAGES :=
@ -10,7 +16,6 @@ define Device/bcm33xx
HCS_REV_MIN := HCS_REV_MIN :=
HCS_REV_MAJ := HCS_REV_MAJ :=
endef endef
DEVICE_VARS += HCS_MAGIC_BYTES HCS_REV_MIN HCS_REV_MAJ
define Device/bcm63xx define Device/bcm63xx
FILESYSTEMS := squashfs jffs2-64k jffs2-128k FILESYSTEMS := squashfs jffs2-64k jffs2-128k
@ -31,8 +36,6 @@ define Device/bcm63xx
CFE_CHIP_ID := CFE_CHIP_ID :=
CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE))
endef endef
DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET
DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS
define Device/bcm63xx_netgear define Device/bcm63xx_netgear
$(Device/bcm63xx) $(Device/bcm63xx)
@ -42,7 +45,6 @@ define Device/bcm63xx_netgear
NETGEAR_BOARD_ID := NETGEAR_BOARD_ID :=
NETGEAR_REGION := NETGEAR_REGION :=
endef endef
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
define Device/bcm63xx_redboot define Device/bcm63xx_redboot
FILESYSTEMS := squashfs FILESYSTEMS := squashfs
@ -52,7 +54,6 @@ define Device/bcm63xx_redboot
IMAGE/redboot.bin := redboot-bin IMAGE/redboot.bin := redboot-bin
REDBOOT_PREFIX := $$(IMAGE_PREFIX) REDBOOT_PREFIX := $$(IMAGE_PREFIX)
endef endef
DEVICE_VARS += REDBOOT_PREFIX
### Generic ### ### Generic ###
define Device/brcm_bcm963281tan define Device/brcm_bcm963281tan

6
target/linux/ipq40xx/image/Makefile
View File

@ -1,8 +1,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION \ DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
WRGG_DEVNAME WRGG_SIGNATURE DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION
DEVICE_VARS += WRGG_DEVNAME WRGG_SIGNATURE
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default
@ -51,7 +52,6 @@ define Device/DniImage
IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni
IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | append-metadata IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | append-metadata
endef endef
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Build/mkmylofw_32m define Build/mkmylofw_32m
$(eval device_id=$(word 1,$(1))) $(eval device_id=$(word 1,$(1)))

5
target/linux/ipq806x/image/Makefile
View File

@ -3,6 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
DEVICE_VARS += TPLINK_BOARD_ID
define Build/buffalo-rootfs-cksum define Build/buffalo-rootfs-cksum
( \ ( \
echo -ne "\x$$(od -A n -t u1 $@ | tr -s ' ' '\n' | \ echo -ne "\x$$(od -A n -t u1 $@ | tr -s ' ' '\n' | \
@ -58,7 +61,6 @@ define Device/DniImage
IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni
IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | sysupgrade-tar kernel=$$$$@ | append-metadata IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | sysupgrade-tar kernel=$$$$@ | append-metadata
endef endef
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Device/TpSafeImage define Device/TpSafeImage
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage
@ -69,7 +71,6 @@ define Device/TpSafeImage
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata
endef endef
DEVICE_VARS += TPLINK_BOARD_ID
define Device/ZyXELImage define Device/ZyXELImage
KERNEL_SUFFIX := -uImage KERNEL_SUFFIX := -uImage

2
target/linux/lantiq/image/Makefile
View File

@ -52,6 +52,7 @@ define Build/fullimage
rm $@.tmp rm $@.tmp
endef endef
DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY
DTS_DIR := $(DTS_DIR)/lantiq DTS_DIR := $(DTS_DIR)/lantiq
# Shared device definition: applies to every defined device # Shared device definition: applies to every defined device
@ -93,7 +94,6 @@ define Device/lantiqBrnImage
IMAGES := factory.bin IMAGES := factory.bin
IMAGE/factory.bin := mkbrnimg | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := mkbrnimg | check-size $$$$(IMAGE_SIZE)
endef endef
DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY
define Device/lantiqFullImage define Device/lantiqFullImage
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | pad-offset 4 0 KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | pad-offset 4 0

3
target/linux/lantiq/image/vr9.mk
View File

@ -1,3 +1,5 @@
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Device/alphanetworks_asl56026 define Device/alphanetworks_asl56026
DEVICE_VENDOR := Alpha DEVICE_VENDOR := Alpha
DEVICE_MODEL := ASL56026 DEVICE_MODEL := ASL56026
@ -199,7 +201,6 @@ define Device/netgear_dm200
NETGEAR_BOARD_ID := DM200 NETGEAR_BOARD_ID := DM200
NETGEAR_HW_ID := 29765233+8+0+64+0+0 NETGEAR_HW_ID := 29765233+8+0+64+0+0
endef endef
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
TARGET_DEVICES += netgear_dm200 TARGET_DEVICES += netgear_dm200
define Device/zyxel_p-2812hnu-f1 define Device/zyxel_p-2812hnu-f1

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

@ -11,6 +11,7 @@ JFFS2_BLOCKSIZE = 128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
DEVICE_VARS += BOOT_SCRIPT UBOOT
KERNEL_LOADADDR := 0x00008000 KERNEL_LOADADDR := 0x00008000
define Build/boot-scr define Build/boot-scr
@ -96,7 +97,6 @@ define Device/Default
UBOOT := UBOOT :=
BOOT_SCRIPT := BOOT_SCRIPT :=
endef endef
DEVICE_VARS += BOOT_SCRIPT UBOOT
define Device/Default-arm64 define Device/Default-arm64
BOOT_SCRIPT := generic-arm64 BOOT_SCRIPT := generic-arm64

1
target/linux/omap/image/Makefile
View File

@ -33,7 +33,6 @@ endef
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default
DEVICE_VARS :=
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := kernel-bin KERNEL := kernel-bin
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz

3
target/linux/ramips/image/mt7621.mk
View File

@ -7,7 +7,7 @@ include ./common-tp-link.mk
DEFAULT_SOC := mt7621 DEFAULT_SOC := mt7621
KERNEL_DTB += -d21 KERNEL_DTB += -d21
DEVICE_VARS += UIMAGE_MAGIC DEVICE_VARS += UIMAGE_MAGIC SERCOMM_HWNAME
# The OEM webinterface expects an kernel with initramfs which has the uImage # The OEM webinterface expects an kernel with initramfs which has the uImage
# header field ih_name. # header field ih_name.
@ -554,7 +554,6 @@ define Device/netgear_sercomm_nand
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
endef endef
DEVICE_VARS += SERCOMM_HWNAME SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
define Device/netgear_r6220 define Device/netgear_r6220
$(Device/netgear_sercomm_nand) $(Device/netgear_sercomm_nand)

2
target/linux/sunxi/image/Makefile
View File

@ -11,6 +11,7 @@ include $(INCLUDE_DIR)/image.mk
FAT32_BLOCK_SIZE=1024 FAT32_BLOCK_SIZE=1024
FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR
KERNEL_LOADADDR:=0x40008000 KERNEL_LOADADDR:=0x40008000
define Build/sunxi-sdcard define Build/sunxi-sdcard
@ -32,7 +33,6 @@ endef
# why \x00\x00\x00\x00 for zImage-initramfs # why \x00\x00\x00\x00 for zImage-initramfs
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default
DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := kernel-bin | uImage none KERNEL := kernel-bin | uImage none
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz

1
target/linux/tegra/image/Makefile
View File

@ -34,6 +34,7 @@ define Build/tegra-sdcard
endef endef
DEVICE_VARS += BOOT_SCRIPT UBOOT DEVICE_VARS += BOOT_SCRIPT UBOOT
define Device/Default define Device/Default
BOOT_SCRIPT := generic-bootscript BOOT_SCRIPT := generic-bootscript
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz