domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath79: netgear: trim down uImage customisations

Browse Source 
Replace NETGEAR_KERNEL_MAGIC by UIMAGE_MAGIC to better match the
variable's purpose. This allows to drop the custom
Build/netgear-uImage.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
[keep UIMAGE_MAGIC definitions even for default value]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Sander Vanheule
2020-11-04 10:21:16 +01:00
committed by Adrian Schmutzler
parent c20b8d690b
commit ab1584a797
4 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ath79/image/common-netgear.mk
View File

@@ -1,9 +1,9 @@
DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
define Build/netgear-rootfs define Build/netgear-rootfs
mkimage \ mkimage \
-A mips -O linux -T filesystem -C none \ -A mips -O linux -T filesystem -C none \
-M $(NETGEAR_KERNEL_MAGIC) \ $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \
-n '$(VERSION_DIST) filesystem' \ -n '$(VERSION_DIST) filesystem' \
-d $(IMAGE_ROOTFS) $@.fs -d $(IMAGE_ROOTFS) $@.fs
cat $@.fs >> $@ cat $@.fs >> $@
@@ -22,21 +22,17 @@ define Build/netgear-squashfs
dd if=/dev/zero bs=1k count=1 >> $@.squashfs dd if=/dev/zero bs=1k count=1 >> $@.squashfs
mkimage \ mkimage \
-A mips -O linux -T filesystem -C none \ -A mips -O linux -T filesystem -C none \
-M $(NETGEAR_KERNEL_MAGIC) \ $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \
-a 0xbf070000 -e 0xbf070000 \ -a 0xbf070000 -e 0xbf070000 \
-n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \ -n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-d $@.squashfs $@ -d $@.squashfs $@
rm -rf $@.squashfs $@.fs rm -rf $@.squashfs $@.fs
endef endef
define Build/netgear-uImage
$(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
endef
define Device/netgear_generic define Device/netgear_generic
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL := kernel-bin | append-dtb | lzma -d20 | uImage lzma
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma
IMAGES += factory.img IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \ IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
append-rootfs | pad-rootfs append-rootfs | pad-rootfs

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

@@ -1225,7 +1225,7 @@ TARGET_DEVICES += nec_wg800hp
define Device/netgear_ex6400_ex7300 define Device/netgear_ex6400_ex7300
$(Device/netgear_generic) $(Device/netgear_generic)
SOC := qca9558 SOC := qca9558
NETGEAR_KERNEL_MAGIC := 0x27051956 UIMAGE_MAGIC := 0x27051956
NETGEAR_BOARD_ID := EX7300series NETGEAR_BOARD_ID := EX7300series
NETGEAR_HW_ID := 29765104+16+0+128 NETGEAR_HW_ID := 29765104+16+0+128
IMAGE_SIZE := 15552k IMAGE_SIZE := 15552k
@@ -1261,7 +1261,7 @@ define Device/netgear_wndr3700
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDR3700 DEVICE_MODEL := WNDR3700
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
NETGEAR_KERNEL_MAGIC := 0x33373030 UIMAGE_MAGIC := 0x33373030
NETGEAR_BOARD_ID := WNDR3700 NETGEAR_BOARD_ID := WNDR3700
IMAGE_SIZE := 7680k IMAGE_SIZE := 7680k
IMAGES += factory-NA.img IMAGES += factory-NA.img
@@ -1275,7 +1275,7 @@ define Device/netgear_wndr3700-v2
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDR3700 DEVICE_MODEL := WNDR3700
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
NETGEAR_KERNEL_MAGIC := 0x33373031 UIMAGE_MAGIC := 0x33373031
NETGEAR_BOARD_ID := WNDR3700v2 NETGEAR_BOARD_ID := WNDR3700v2
NETGEAR_HW_ID := 29763654+16+64 NETGEAR_HW_ID := 29763654+16+64
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@@ -1286,7 +1286,7 @@ TARGET_DEVICES += netgear_wndr3700-v2
define Device/netgear_wndr3800 define Device/netgear_wndr3800
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDR3800 DEVICE_MODEL := WNDR3800
NETGEAR_KERNEL_MAGIC := 0x33373031 UIMAGE_MAGIC := 0x33373031
NETGEAR_BOARD_ID := WNDR3800 NETGEAR_BOARD_ID := WNDR3800
NETGEAR_HW_ID := 29763654+16+128 NETGEAR_HW_ID := 29763654+16+128
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@@ -1297,7 +1297,7 @@ TARGET_DEVICES += netgear_wndr3800
define Device/netgear_wndr3800ch define Device/netgear_wndr3800ch
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDR3800CH DEVICE_MODEL := WNDR3800CH
NETGEAR_KERNEL_MAGIC := 0x33373031 UIMAGE_MAGIC := 0x33373031
NETGEAR_BOARD_ID := WNDR3800CH NETGEAR_BOARD_ID := WNDR3800CH
NETGEAR_HW_ID := 29763654+16+128 NETGEAR_HW_ID := 29763654+16+128
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@@ -1309,7 +1309,7 @@ define Device/netgear_wndrmac-v1
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDRMAC DEVICE_MODEL := WNDRMAC
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
NETGEAR_KERNEL_MAGIC := 0x33373031 UIMAGE_MAGIC := 0x33373031
NETGEAR_BOARD_ID := WNDRMAC NETGEAR_BOARD_ID := WNDRMAC
NETGEAR_HW_ID := 29763654+16+64 NETGEAR_HW_ID := 29763654+16+64
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@@ -1321,7 +1321,7 @@ define Device/netgear_wndrmac-v2
$(Device/netgear_wndr3x00) $(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDRMAC DEVICE_MODEL := WNDRMAC
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
NETGEAR_KERNEL_MAGIC := 0x33373031 UIMAGE_MAGIC := 0x33373031
NETGEAR_BOARD_ID := WNDRMACv2 NETGEAR_BOARD_ID := WNDRMACv2
NETGEAR_HW_ID := 29763654+16+128 NETGEAR_HW_ID := 29763654+16+128
IMAGE_SIZE := 15872k IMAGE_SIZE := 15872k
@@ -1334,7 +1334,7 @@ define Device/netgear_wnr2200_common
SOC := ar7241 SOC := ar7241
DEVICE_MODEL := WNR2200 DEVICE_MODEL := WNR2200
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
NETGEAR_KERNEL_MAGIC := 0x32323030 UIMAGE_MAGIC := 0x32323030
NETGEAR_BOARD_ID := wnr2200 NETGEAR_BOARD_ID := wnr2200
endef endef

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

@@ -1,5 +1,3 @@
include ./common-netgear.mk # for netgear-uImage
DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION 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
@@ -163,10 +161,10 @@ define Device/netgear_ath79_nand
PAGESIZE := 2048 PAGESIZE := 2048
IMAGE_SIZE := 25600k IMAGE_SIZE := 25600k
KERNEL := kernel-bin | append-dtb | lzma -d20 | \ KERNEL := kernel-bin | append-dtb | lzma -d20 | \
pad-offset $$(KERNEL_SIZE) 129 | netgear-uImage lzma | \ pad-offset $$(KERNEL_SIZE) 129 | uImage lzma | \
append-string -e '\xff' | \ append-string -e '\xff' | \
append-uImage-fakehdr filesystem $$(NETGEAR_KERNEL_MAGIC) append-uImage-fakehdr filesystem $$(UIMAGE_MAGIC)
KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma
IMAGES := sysupgrade.bin factory.img IMAGES := sysupgrade.bin factory.img
IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \ IMAGE/factory.img := append-kernel | append-ubi | netgear-dni | \
check-size check-size
@@ -179,7 +177,7 @@ define Device/netgear_wndr3700-v4
SOC := ar9344 SOC := ar9344
DEVICE_MODEL := WNDR3700 DEVICE_MODEL := WNDR3700
DEVICE_VARIANT := v4 DEVICE_VARIANT := v4
NETGEAR_KERNEL_MAGIC := 0x33373033 UIMAGE_MAGIC := 0x33373033
NETGEAR_BOARD_ID := WNDR3700v4 NETGEAR_BOARD_ID := WNDR3700v4
NETGEAR_HW_ID := 29763948+128+128 NETGEAR_HW_ID := 29763948+128+128
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)
@@ -189,7 +187,7 @@ TARGET_DEVICES += netgear_wndr3700-v4
define Device/netgear_wndr4300 define Device/netgear_wndr4300
SOC := ar9344 SOC := ar9344
DEVICE_MODEL := WNDR4300 DEVICE_MODEL := WNDR4300
NETGEAR_KERNEL_MAGIC := 0x33373033 UIMAGE_MAGIC := 0x33373033
NETGEAR_BOARD_ID := WNDR4300 NETGEAR_BOARD_ID := WNDR4300
NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3 NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)
@@ -199,7 +197,7 @@ TARGET_DEVICES += netgear_wndr4300
define Device/netgear_wndr4300sw define Device/netgear_wndr4300sw
SOC := ar9344 SOC := ar9344
DEVICE_MODEL := WNDR4300SW DEVICE_MODEL := WNDR4300SW
NETGEAR_KERNEL_MAGIC := 0x33373033 UIMAGE_MAGIC := 0x33373033
NETGEAR_BOARD_ID := WNDR4300SW NETGEAR_BOARD_ID := WNDR4300SW
NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3 NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)
@@ -209,7 +207,7 @@ TARGET_DEVICES += netgear_wndr4300sw
define Device/netgear_wndr4300tn define Device/netgear_wndr4300tn
SOC := ar9344 SOC := ar9344
DEVICE_MODEL := WNDR4300TN DEVICE_MODEL := WNDR4300TN
NETGEAR_KERNEL_MAGIC := 0x33373033 UIMAGE_MAGIC := 0x33373033
NETGEAR_BOARD_ID := WNDR4300TN NETGEAR_BOARD_ID := WNDR4300TN
NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3 NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)
@@ -220,7 +218,7 @@ define Device/netgear_wndr4300-v2
SOC := qca9563 SOC := qca9563
DEVICE_MODEL := WNDR4300 DEVICE_MODEL := WNDR4300
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
NETGEAR_KERNEL_MAGIC := 0x27051956 UIMAGE_MAGIC := 0x27051956
NETGEAR_BOARD_ID := WNDR4500series NETGEAR_BOARD_ID := WNDR4500series
NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012175 NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012175
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)
@@ -231,7 +229,7 @@ define Device/netgear_wndr4500-v3
SOC := qca9563 SOC := qca9563
DEVICE_MODEL := WNDR4500 DEVICE_MODEL := WNDR4500
DEVICE_VARIANT := v3 DEVICE_VARIANT := v3
NETGEAR_KERNEL_MAGIC := 0x27051956 UIMAGE_MAGIC := 0x27051956
NETGEAR_BOARD_ID := WNDR4500series NETGEAR_BOARD_ID := WNDR4500series
NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012173 NETGEAR_HW_ID := 29764821+2+128+128+3x3+3x3+5508012173
$(Device/netgear_ath79_nand) $(Device/netgear_ath79_nand)

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

@@ -6,7 +6,7 @@ define Device/netgear_wnr612-v2
DEVICE_MODEL := WNR612 DEVICE_MODEL := WNR612
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
DEVICE_DTS := ar7240_netgear_wnr612-v2 DEVICE_DTS := ar7240_netgear_wnr612-v2
NETGEAR_KERNEL_MAGIC := 0x32303631 UIMAGE_MAGIC := 0x32303631
NETGEAR_BOARD_ID := REALWNR612V2 NETGEAR_BOARD_ID := REALWNR612V2
IMAGE_SIZE := 3712k IMAGE_SIZE := 3712k
SUPPORTED_DEVICES += wnr612-v2 SUPPORTED_DEVICES += wnr612-v2
@@ -19,7 +19,7 @@ define Device/on_n150r
SOC := ar7240 SOC := ar7240
DEVICE_VENDOR := On Networks DEVICE_VENDOR := On Networks
DEVICE_MODEL := N150R DEVICE_MODEL := N150R
NETGEAR_KERNEL_MAGIC := 0x32303631 UIMAGE_MAGIC := 0x32303631
NETGEAR_BOARD_ID := N150R NETGEAR_BOARD_ID := N150R
IMAGE_SIZE := 3712k IMAGE_SIZE := 3712k
SUPPORTED_DEVICES += n150r SUPPORTED_DEVICES += n150r
@@ -32,7 +32,7 @@ define Device/netgear_wnr1000-v2
SOC := ar7240 SOC := ar7240
DEVICE_MODEL := WNR1000 DEVICE_MODEL := WNR1000
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
NETGEAR_KERNEL_MAGIC := 0x31303031 UIMAGE_MAGIC := 0x31303031
NETGEAR_BOARD_ID := WNR1000V2 NETGEAR_BOARD_ID := WNR1000V2
NETGEAR_HW_ID := 29763331+4+32 NETGEAR_HW_ID := 29763331+4+32
IMAGE_SIZE := 3712k IMAGE_SIZE := 3712k
@@ -46,7 +46,7 @@ define Device/netgear_wnr2000-v3
SOC := ar7241 SOC := ar7241
DEVICE_MODEL := WNR2000 DEVICE_MODEL := WNR2000
DEVICE_VARIANT := v3 DEVICE_VARIANT := v3
NETGEAR_KERNEL_MAGIC := 0x32303033 UIMAGE_MAGIC := 0x32303033
NETGEAR_BOARD_ID := WNR2000V3 NETGEAR_BOARD_ID := WNR2000V3
NETGEAR_HW_ID := 29763551+04+32 NETGEAR_HW_ID := 29763551+04+32
IMAGE_SIZE := 3712k IMAGE_SIZE := 3712k