ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 15:56:49 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ath79: remove duplicate image build variables

Browse Source 
Remove image build variables which are set to the same value as the
default image build recipe.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2018-12-06 12:07:56 +01:00
parent 9d8fcab77a
commit dacd962cfd
6 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/image/common-tp-link.mk
View File

@ -53,7 +53,7 @@ define Device/tplink
LOADER_TYPE := gz LOADER_TYPE := gz
KERNEL := kernel-bin | append-dtb | lzma KERNEL := kernel-bin | append-dtb | lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v1-header
IMAGES := sysupgrade.bin factory.bin IMAGES += factory.bin
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade | append-metadata
IMAGE/factory.bin := append-rootfs | mktplinkfw factory IMAGE/factory.bin := append-rootfs | mktplinkfw factory
endef endef

2
target/linux/ath79/image/generic-tp-link.mk
View File

@ -37,7 +37,7 @@ define Device/tplink_archer-c7-v2
DEVICE_TITLE := TP-LINK Archer C7 v2 DEVICE_TITLE := TP-LINK Archer C7 v2
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
TPLINK_HWID := 0xc7000002 TPLINK_HWID := 0xc7000002
IMAGES := sysupgrade.bin factory.bin factory-us.bin factory-eu.bin IMAGES += factory-us.bin factory-eu.bin
IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
endef endef

4
target/linux/ath79/image/generic-ubnt.mk
View File

@ -150,8 +150,6 @@ TARGET_DEVICES += ubnt_unifi
define Device/ubnt_unifiac define Device/ubnt_unifiac
ATH_SOC := qca9563 ATH_SOC := qca9563
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
endef endef
@ -189,7 +187,7 @@ define Device/ubnt_routerstation_common
DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig
ATH_SOC := ar7161 ATH_SOC := ar7161
IMAGE_SIZE := 16128k IMAGE_SIZE := 16128k
IMAGES := sysupgrade.bin factory.bin IMAGES += factory.bin
IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) | append-metadata IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) | append-metadata
KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE)

12
target/linux/ath79/image/generic.mk
View File

@ -253,7 +253,6 @@ define Device/pcs_cap324
ATH_SOC := ar9344 ATH_SOC := ar9344
DEVICE_TITLE := PowerCloud Systems CAP324 DEVICE_TITLE := PowerCloud Systems CAP324
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k
IMAGES := sysupgrade.bin
SUPPORTED_DEVICES += cap324 SUPPORTED_DEVICES += cap324
endef endef
TARGET_DEVICES += pcs_cap324 TARGET_DEVICES += pcs_cap324
@ -262,7 +261,6 @@ define Device/pcs_cr3000
ATH_SOC := ar9341 ATH_SOC := ar9341
DEVICE_TITLE := PowerCloud Systems CR3000 DEVICE_TITLE := PowerCloud Systems CR3000
IMAGE_SIZE := 7808k IMAGE_SIZE := 7808k
IMAGES := sysupgrade.bin
SUPPORTED_DEVICES += cr3000 SUPPORTED_DEVICES += cr3000
endef endef
TARGET_DEVICES += pcs_cr3000 TARGET_DEVICES += pcs_cr3000
@ -272,7 +270,6 @@ define Device/pcs_cr5000
DEVICE_TITLE := PowerCloud Systems CR5000 DEVICE_TITLE := PowerCloud Systems CR5000
DEVICE_PACKAGES := kmod-usb2 kmod-usb-core DEVICE_PACKAGES := kmod-usb2 kmod-usb-core
IMAGE_SIZE := 7808k IMAGE_SIZE := 7808k
IMAGES := sysupgrade.bin
SUPPORTED_DEVICES += cr5000 SUPPORTED_DEVICES += cr5000
endef endef
TARGET_DEVICES += pcs_cr5000 TARGET_DEVICES += pcs_cr5000
@ -280,7 +277,7 @@ TARGET_DEVICES += pcs_cr5000
define Device/netgear_wndr3x00 define Device/netgear_wndr3x00
ATH_SOC := ar7161 ATH_SOC := ar7161
KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
IMAGES := sysupgrade.bin factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
@ -316,7 +313,6 @@ define Device/pisen_wmm003n
DEVICE_TITLE := Pisen WMM003N (Cloud Easy Power) DEVICE_TITLE := Pisen WMM003N (Cloud Easy Power)
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-chipidea2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-chipidea2
TPLINK_HWID := 0x07030101 TPLINK_HWID := 0x07030101
IMAGES := sysupgrade.bin
endef endef
TARGET_DEVICES += pisen_wmm003n TARGET_DEVICES += pisen_wmm003n
@ -334,12 +330,8 @@ TARGET_DEVICES += netgear_wndr3800
define Device/phicomm_k2t define Device/phicomm_k2t
ATH_SOC := qca9563 ATH_SOC := qca9563
DEVICE_TITLE := Phicomm K2T DEVICE_TITLE := Phicomm K2T
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
IMAGE_SIZE := 15744k IMAGE_SIZE := 15744k
IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
IMAGE/default := append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct
endef endef
TARGET_DEVICES += phicomm_k2t TARGET_DEVICES += phicomm_k2t

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

@ -6,8 +6,8 @@ define Device/glinet_ar300m-nand
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
VID_HDR_OFFSET := 512 VID_HDR_OFFSET := 512
IMAGES := factory.ubi sysupgrade.tar IMAGES += factory.ubi
IMAGE/sysupgrade.tar := sysupgrade-tar IMAGE/sysupgrade.bin := sysupgrade-tar
IMAGE/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.ubi := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
endef endef
TARGET_DEVICES += glinet_ar300m-nand TARGET_DEVICES += glinet_ar300m-nand

4
target/linux/ath79/image/tiny-netgear.mk
View File

@ -10,7 +10,7 @@ define Device/netgear_wnr612-v2
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
NETGEAR_BOARD_ID := REALWNR612V2 NETGEAR_BOARD_ID := REALWNR612V2
IMAGE_SIZE := 3904k IMAGE_SIZE := 3904k
IMAGES := sysupgrade.bin factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)
@ -26,7 +26,7 @@ define Device/on_n150r
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
NETGEAR_BOARD_ID := N150R NETGEAR_BOARD_ID := N150R
IMAGE_SIZE := 3904k IMAGE_SIZE := 3904k
IMAGES := sysupgrade.bin factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE)