From 7bc5571d148cbb404a39b0d10fe41957547ba1e8 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Thu, 8 Jun 2017 15:18:34 +0200 Subject: [PATCH] ar71xx: image: use simply expanded variables Signed-off-by: Piotr Dymacz --- target/linux/ar71xx/image/Makefile | 2 +- target/linux/ar71xx/image/generic.mk | 322 +++++++++++++------------- target/linux/ar71xx/image/mikrotik.mk | 2 +- target/linux/ar71xx/image/nand.mk | 36 +-- target/linux/ar71xx/image/tp-link.mk | 10 +- target/linux/ar71xx/image/ubnt.mk | 32 +-- 6 files changed, 202 insertions(+), 202 deletions(-) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 72ae3d59ff..6c70babc56 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -53,7 +53,7 @@ define Device/Default PROFILES = Default Minimal $$(DEVICE_PROFILE) MTDPARTS := BLOCKSIZE := 64k - CONSOLE = ttyS0,115200 + CONSOLE := ttyS0,115200 CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE)) KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma COMPILE := diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 0009c0f70d..1d0a047bbd 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -78,7 +78,7 @@ endef define Device/ap531b0 DEVICE_TITLE := Rockeetech AP531B0 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = AP531B0 + BOARDNAME := AP531B0 IMAGE_SIZE := 16000k MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef @@ -86,37 +86,37 @@ TARGET_DEVICES += ap531b0 define Device/ap90q DEVICE_TITLE := YunCore AP90Q - BOARDNAME = AP90Q - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + BOARDNAME := AP90Q + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += ap90q define Device/bsb DEVICE_TITLE := Smart Electronics Black Swift board DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = BSB - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:128k(u-boot)ro,64k(u-boot-env)ro,16128k(firmware),64k(art)ro + BOARDNAME := BSB + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:128k(u-boot)ro,64k(u-boot-env)ro,16128k(firmware),64k(art)ro endef TARGET_DEVICES += bsb define Device/carambola2 DEVICE_TITLE := 8devices Carambola2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = CARAMBOLA2 - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := CARAMBOLA2 + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += carambola2 define Device/cf-e316n-v2 DEVICE_TITLE := COMFAST CF-E316N v2 - BOARDNAME = CF-E316N-V2 - IMAGE_SIZE = 16192k - MTDPARTS = spi0.0:64k(u-boot)ro,64k(art)ro,16192k(firmware),64k(art-backup)ro + BOARDNAME := CF-E316N-V2 + IMAGE_SIZE := 16192k + MTDPARTS := spi0.0:64k(u-boot)ro,64k(art)ro,16192k(firmware),64k(art-backup)ro endef TARGET_DEVICES += cf-e316n-v2 @@ -124,49 +124,49 @@ define Device/cf-e320n-v2 $(Device/cf-e316n-v2) DEVICE_TITLE := COMFAST CF-E320N v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = CF-E320N-V2 + BOARDNAME := CF-E320N-V2 endef TARGET_DEVICES += cf-e320n-v2 define Device/cf-e380ac-v1 DEVICE_TITLE := COMFAST CF-E380AC v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = CF-E380AC-V1 - IMAGE_SIZE = 16128k - MTDPARTS = spi0.0:128k(u-boot)ro,64k(art)ro,16128k(firmware),64k(art-backup)ro + BOARDNAME := CF-E380AC-V1 + IMAGE_SIZE := 16128k + MTDPARTS := spi0.0:128k(u-boot)ro,64k(art)ro,16128k(firmware),64k(art-backup)ro endef TARGET_DEVICES += cf-e380ac-v1 define Device/cf-e380ac-v2 $(Device/cf-e380ac-v1) DEVICE_TITLE := COMFAST CF-E380AC v2 - BOARDNAME = CF-E380AC-V2 - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(art)ro,16000k(firmware),64k(art-backup)ro + BOARDNAME := CF-E380AC-V2 + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(art)ro,16000k(firmware),64k(art-backup)ro endef TARGET_DEVICES += cf-e380ac-v2 define Device/cf-e520n DEVICE_TITLE := COMFAST CF-E520N DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = CF-E520N - IMAGE_SIZE = 8000k - MTDPARTS = spi0.0:64k(u-boot)ro,64k(art)ro,8000k(firmware),64k(art-backup)ro + BOARDNAME := CF-E520N + IMAGE_SIZE := 8000k + MTDPARTS := spi0.0:64k(u-boot)ro,64k(art)ro,8000k(firmware),64k(art-backup)ro endef TARGET_DEVICES += cf-e520n define Device/cf-e530n $(Device/cf-e520n) DEVICE_TITLE := COMFAST CF-E530N - BOARDNAME = CF-E530N + BOARDNAME := CF-E530N endef TARGET_DEVICES += cf-e530n define Device/cpe505n DEVICE_TITLE := P&W CPE505N - BOARDNAME = CPE505N - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := CPE505N + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += cpe505n @@ -174,16 +174,16 @@ define Device/cpe830 $(Device/ap90q) DEVICE_TITLE := YunCore CPE830 DEVICE_PACKAGES := rssileds - BOARDNAME = CPE830 + BOARDNAME := CPE830 endef TARGET_DEVICES += cpe830 define Device/cpe870 DEVICE_TITLE := YunCore CPE870 DEVICE_PACKAGES := rssileds - BOARDNAME = CPE870 - IMAGE_SIZE = 7936k - MTDPARTS = spi0.0:64k(u-boot)ro,64k(u-boot-env),7936k(firmware),64k(config)ro,64k(art)ro + BOARDNAME := CPE870 + IMAGE_SIZE := 7936k + MTDPARTS := spi0.0:64k(u-boot)ro,64k(u-boot-env),7936k(firmware),64k(config)ro,64k(art)ro endef TARGET_DEVICES += cpe870 @@ -200,80 +200,80 @@ TARGET_DEVICES += dragino2 define Device/weio DEVICE_TITLE := WeIO DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = WEIO - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := WEIO + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += weio define Device/gl-ar150 DEVICE_TITLE := GL.iNet GL-AR150 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = GL-AR150 - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := GL-AR150 + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar150 define Device/gl-ar300 DEVICE_TITLE := GL.iNet GL-AR300 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = GL-AR300 - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := GL-AR300 + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar300 define Device/gl-ar300m DEVICE_TITLE := GL.iNet GL-AR300M DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = GL-AR300M - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + BOARDNAME := GL-AR300M + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-ar300m define Device/gl-domino DEVICE_TITLE := GL.iNet Domino Pi DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = DOMINO - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := DOMINO + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-domino define Device/gl-mifi DEVICE_TITLE := GL.iNet GL-MiFi DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = GL-MIFI - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := GL-MIFI + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += gl-mifi define Device/lima DEVICE_TITLE := 8devices Lima DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = LIMA - IMAGE_SIZE = 15616k - MTDPARTS = spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,256k(art)ro,-(firmware) + BOARDNAME := LIMA + IMAGE_SIZE := 15616k + MTDPARTS := spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,256k(art)ro,-(firmware) endef TARGET_DEVICES += lima define Device/mr12 DEVICE_TITLE := Meraki MR12 DEVICE_PACKAGES := kmod-spi-gpio - BOARDNAME = MR12 + BOARDNAME := MR12 ROOTFS_SIZE := 13440k - IMAGE_SIZE = 15680k - MTDPARTS = spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2240k(kernel),64k(mac),128k(art)ro,15680k@0x80000(firmware) - IMAGE/kernel.bin = append-kernel - IMAGE/rootfs.bin = append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE_SIZE := 15680k + MTDPARTS := spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2240k(kernel),64k(mac),128k(art)ro,15680k@0x80000(firmware) + IMAGE/kernel.bin := append-kernel + IMAGE/rootfs.bin := append-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) IMAGES := kernel.bin rootfs.bin sysupgrade.bin endef TARGET_DEVICES += mr12 @@ -281,87 +281,87 @@ TARGET_DEVICES += mr12 define Device/mr16 DEVICE_TITLE := Meraki MR16 DEVICE_PACKAGES := kmod-spi-gpio - BOARDNAME = MR16 + BOARDNAME := MR16 ROOTFS_SIZE := 13440k - IMAGE_SIZE = 15680k - MTDPARTS = spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2240k(kernel),64k(mac),128k(art)ro,15680k@0x80000(firmware) - IMAGE/kernel.bin = append-kernel - IMAGE/rootfs.bin = append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE_SIZE := 15680k + MTDPARTS := spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2240k(kernel),64k(mac),128k(art)ro,15680k@0x80000(firmware) + IMAGE/kernel.bin := append-kernel + IMAGE/rootfs.bin := append-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) IMAGES := kernel.bin rootfs.bin sysupgrade.bin endef TARGET_DEVICES += mr16 define Device/dr344 DEVICE_TITLE := Wallys DR344 - BOARDNAME = DR344 + BOARDNAME := DR344 KERNEL_SIZE := 1408k ROOTFS_SIZE := 6336k - IMAGE_SIZE = 7744k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE_SIZE := 7744k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += dr344 define Device/dr531 DEVICE_TITLE := Wallys DR531 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = DR531 - IMAGE_SIZE = 7808k - MTDPARTS = spi0.0:192k(u-boot)ro,64k(u-boot-env),64k(partition-table)ro,7808k(firmware),64k(art)ro + BOARDNAME := DR531 + IMAGE_SIZE := 7808k + MTDPARTS := spi0.0:192k(u-boot)ro,64k(u-boot-env),64k(partition-table)ro,7808k(firmware),64k(art)ro endef TARGET_DEVICES += dr531 define Device/wndr3700 DEVICE_TITLE := NETGEAR WNDR3700 DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-wndr3700-usb - BOARDNAME = WNDR3700 - NETGEAR_KERNEL_MAGIC = 0x33373030 - NETGEAR_BOARD_ID = WNDR3700 - IMAGE_SIZE = 7680k - MTDPARTS = spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,7680k(firmware),64k(art)ro + BOARDNAME := WNDR3700 + NETGEAR_KERNEL_MAGIC := 0x33373030 + NETGEAR_BOARD_ID := WNDR3700 + IMAGE_SIZE := 7680k + MTDPARTS := spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,7680k(firmware),64k(art)ro IMAGES := sysupgrade.bin factory.img factory-NA.img KERNEL := kernel-bin | patch-cmdline | lzma -d20 | netgear-uImage lzma - IMAGE/default = append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin = $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img = $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) + IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs + IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) endef define Device/wndr3700v2 $(Device/wndr3700) DEVICE_TITLE := NETGEAR WNDR3700 v2 - NETGEAR_BOARD_ID = WNDR3700v2 - NETGEAR_KERNEL_MAGIC = 0x33373031 - NETGEAR_HW_ID = 29763654+16+64 - IMAGE_SIZE = 15872k - MTDPARTS = spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,15872k(firmware),64k(art)ro + NETGEAR_BOARD_ID := WNDR3700v2 + NETGEAR_KERNEL_MAGIC := 0x33373031 + NETGEAR_HW_ID := 29763654+16+64 + IMAGE_SIZE := 15872k + MTDPARTS := spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,15872k(firmware),64k(art)ro IMAGES := sysupgrade.bin factory.img endef define Device/wndr3800 $(Device/wndr3700v2) DEVICE_TITLE := NETGEAR WNDR3800 - NETGEAR_BOARD_ID = WNDR3800 - NETGEAR_HW_ID = 29763654+16+128 + NETGEAR_BOARD_ID := WNDR3800 + NETGEAR_HW_ID := 29763654+16+128 endef define Device/wndr3800ch $(Device/wndr3800) DEVICE_TITLE := NETGEAR WNDR3800 (Ch) - NETGEAR_BOARD_ID = WNDR3800CH + NETGEAR_BOARD_ID := WNDR3800CH endef define Device/wndrmac $(Device/wndr3700v2) DEVICE_TITLE := NETGEAR WNDRMAC - NETGEAR_BOARD_ID = WNDRMAC + NETGEAR_BOARD_ID := WNDRMAC endef define Device/wndrmacv2 $(Device/wndr3800) DEVICE_TITLE := NETGEAR WNDRMAC v2 - NETGEAR_BOARD_ID = WNDRMACv2 + NETGEAR_BOARD_ID := WNDRMACv2 endef TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2 @@ -369,8 +369,8 @@ define Device/cap324 DEVICE_TITLE := PowerCloud CAP324 Cloud AP BOARDNAME := CAP324 DEVICE_PROFILE := CAP324 - IMAGE_SIZE = 15296k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15296k(firmware),640k(certs),64k(nvram),64k(art)ro + IMAGE_SIZE := 15296k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15296k(firmware),640k(certs),64k(nvram),64k(art)ro endef TARGET_DEVICES += cap324 @@ -378,8 +378,8 @@ define Device/cap324-nocloud DEVICE_TITLE := PowerCloud CAP324 Cloud AP (No-Cloud) BOARDNAME := CAP324 DEVICE_PROFILE := CAP324 - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += cap324-nocloud @@ -387,8 +387,8 @@ define Device/cr3000 DEVICE_TITLE := PowerCloud CR3000 Cloud Router BOARDNAME := CR3000 DEVICE_PROFILE := CR3000 - IMAGE_SIZE = 7104k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art)ro + IMAGE_SIZE := 7104k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art)ro endef TARGET_DEVICES += cr3000 @@ -396,8 +396,8 @@ define Device/cr3000-nocloud DEVICE_TITLE := PowerCloud CR3000 (No-Cloud) BOARDNAME := CR3000 DEVICE_PROFILE := CR3000 - IMAGE_SIZE = 7808k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro + IMAGE_SIZE := 7808k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro endef TARGET_DEVICES += cr3000-nocloud @@ -406,8 +406,8 @@ define Device/cr5000 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-core BOARDNAME := CR5000 DEVICE_PROFILE := CR5000 - IMAGE_SIZE = 7104k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art)ro + IMAGE_SIZE := 7104k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art)ro endef TARGET_DEVICES += cr5000 @@ -416,18 +416,18 @@ define Device/cr5000-nocloud DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-core BOARDNAME := CR5000 DEVICE_PROFILE := CR5000 - IMAGE_SIZE = 7808k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro + IMAGE_SIZE := 7808k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro endef TARGET_DEVICES += cr5000-nocloud define Device/pqi-air-pen DEVICE_TITLE := PQI Air Pen DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage - BOARDNAME = PQI-AIR-PEN - IMAGE_SIZE = 7744k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(art)ro,64k(NVRAM)ro,7680k(firmware),64k(CONF) + BOARDNAME := PQI-AIR-PEN + IMAGE_SIZE := 7744k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(art)ro,64k(NVRAM)ro,7680k(firmware),64k(CONF) endef TARGET_DEVICES += pqi-air-pen @@ -506,18 +506,18 @@ TARGET_DEVICES += gl-inet-6408A-v1 gl-inet-6416A-v1 define Device/jwap230 DEVICE_TITLE := jjPlus JWAP230 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = JWAP230 - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + BOARDNAME := JWAP230 + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += jwap230 define Device/r602n DEVICE_TITLE := P&W R602N DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = R602N - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + BOARDNAME := R602N + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += r602n @@ -584,27 +584,27 @@ TARGET_DEVICES += onion-omega define Device/sc1750 DEVICE_TITLE := Abicom SC1750 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - BOARDNAME = SC1750 - IMAGE_SIZE = 15744k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) + BOARDNAME := SC1750 + IMAGE_SIZE := 15744k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) endef TARGET_DEVICES += sc1750 define Device/sc300m DEVICE_TITLE := Abicom SC300M DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - BOARDNAME = SC300M - IMAGE_SIZE = 15744k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) + BOARDNAME := SC300M + IMAGE_SIZE := 15744k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) endef TARGET_DEVICES += sc300m define Device/sc450 DEVICE_TITLE := Abicom SC450 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - BOARDNAME = SC450 - IMAGE_SIZE = 15744k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) + BOARDNAME := SC450 + IMAGE_SIZE := 15744k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),15744k(firmware),128k(APConfig),128k(kplog),64k(ART) endef TARGET_DEVICES += sc450 @@ -631,9 +631,9 @@ TARGET_DEVICES += som9331 define Device/sr3200 DEVICE_TITLE := YunCore SR3200 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = SR3200 - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro + BOARDNAME := SR3200 + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro endef TARGET_DEVICES += sr3200 @@ -641,7 +641,7 @@ define Device/xd3200 $(Device/sr3200) DEVICE_TITLE := YunCore XD3200 DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = XD3200 + BOARDNAME := XD3200 endef TARGET_DEVICES += xd3200 @@ -670,14 +670,14 @@ TARGET_DEVICES += oolite define Device/NBG6616 DEVICE_TITLE := ZyXEL NBG6616 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = NBG6616 - KERNEL_SIZE = 2048k - IMAGE_SIZE = 15323k - MTDPARTS = spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware) + BOARDNAME := NBG6616 + KERNEL_SIZE := 2048k + IMAGE_SIZE := 15323k + MTDPARTS := spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware) CMDLINE += mem=128M IMAGES := sysupgrade.bin KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) # We cannot currently build a factory image. It is the sysupgrade image # prefixed with a header (which is actually written into the MTD device). # The header is 2kiB and is filled with 0xff. The format seems to be: @@ -705,11 +705,11 @@ TARGET_DEVICES += NBG6616 define Device/c-55 DEVICE_TITLE := AirTight Networks C-55 DEVICE_PACKAGES := kmod-ath9k - BOARDNAME = C-55 - KERNEL_SIZE = 2048k - IMAGE_SIZE = 15872k - MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware) - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + BOARDNAME := C-55 + KERNEL_SIZE := 2048k + IMAGE_SIZE := 15872k + MTDPARTS := spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += c-55 @@ -752,9 +752,9 @@ define Device/dir-869-a1 $(Device/seama) DEVICE_TITLE := D-Link DIR-869 rev. A1 DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = DIR-869-A1 - IMAGE_SIZE = 15872k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro + BOARDNAME := DIR-869-A1 + IMAGE_SIZE := 15872k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro SEAMA_SIGNATURE := wrgac54_dlink.2015_dir869 IMAGE/factory.bin := \ $$(IMAGE/default) | pad-rootfs -x 64 | \ @@ -766,9 +766,9 @@ define Device/mynet-n600 $(Device/seama) DEVICE_TITLE := Western Digital My Net N600 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = MYNET-N600 - IMAGE_SIZE = 15808k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro + BOARDNAME := MYNET-N600 + IMAGE_SIZE := 15808k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro SEAMA_SIGNATURE := wrgnd16_wd_db600 endef @@ -776,9 +776,9 @@ define Device/mynet-n750 $(Device/seama) DEVICE_TITLE := Western Digital My Net N750 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = MYNET-N750 - IMAGE_SIZE = 15808k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro + BOARDNAME := MYNET-N750 + IMAGE_SIZE := 15808k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,64k(devdata)ro,64k(devconf)ro,15872k(firmware),64k(radiocfg)ro SEAMA_SIGNATURE := wrgnd13_wd_av endef @@ -786,9 +786,9 @@ define Device/qihoo-c301 $(Device/seama) DEVICE_TITLE := Qihoo C301 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = QIHOO-C301 - IMAGE_SIZE = 15744k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) + BOARDNAME := QIHOO-C301 + IMAGE_SIZE := 15744k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) SEAMA_SIGNATURE := wrgac26_qihoo360_360rg endef TARGET_DEVICES += dir-869-a1 mynet-n600 mynet-n750 qihoo-c301 @@ -796,14 +796,14 @@ TARGET_DEVICES += dir-869-a1 mynet-n600 mynet-n750 qihoo-c301 define Device/dap-2695-a1 DEVICE_TITLE := D-Link DAP-2695 rev. A1 DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k - BOARDNAME = DAP-2695-A1 + BOARDNAME := DAP-2695-A1 IMAGES := factory.img sysupgrade.bin - IMAGE_SIZE = 15360k - IMAGE/factory.img = append-kernel | pad-offset 65536 160 | append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin = append-kernel | pad-offset 65536 160 | mkwrggimg | append-rootfs | wrgg-pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE_SIZE := 15360k + IMAGE/factory.img := append-kernel | pad-offset 65536 160 | append-rootfs | wrgg-pad-rootfs | mkwrggimg | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-offset 65536 160 | mkwrggimg | append-rootfs | wrgg-pad-rootfs | check-size $$$$(IMAGE_SIZE) KERNEL := kernel-bin | patch-cmdline | relocate-kernel | lzma KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg - MTDPARTS = spi0.0:256k(bootloader)ro,64k(bdcfg)ro,64k(rgdb)ro,64k(langpack)ro,15360k(firmware),448k(captival)ro,64k(certificate)ro,64k(radiocfg)ro + MTDPARTS := spi0.0:256k(bootloader)ro,64k(bdcfg)ro,64k(rgdb)ro,64k(langpack)ro,15360k(firmware),448k(captival)ro,64k(certificate)ro,64k(radiocfg)ro DAP_SIGNATURE := wapac02_dkbs_dap2695 endef TARGET_DEVICES += dap-2695-a1 @@ -816,8 +816,8 @@ define Device/bhr-4grv2 IMAGE_SIZE := 16000k MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | mkbuffaloimg + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | mkbuffaloimg endef TARGET_DEVICES += bhr-4grv2 @@ -866,6 +866,6 @@ define Device/zbt-we1526 KERNEL_SIZE := 1472k ROOTFS_SIZE := 14528k MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += zbt-we1526 diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index 2c3807f486..7c3374062d 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -31,7 +31,7 @@ define Device/rb-nor-flash-16M KERNEL_INSTALL := 1 KERNEL := kernel-bin | lzma | loader-kernel SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-962uigs-5hact2hnt rb-lhg-5nd rb-mapl-2nd - IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \ + IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk index bd9eaf70c5..fafccb9b77 100644 --- a/target/linux/ar71xx/image/nand.mk +++ b/target/linux/ar71xx/image/nand.mk @@ -18,12 +18,12 @@ endef define Device/c-60 DEVICE_TITLE := AirTight C-60 DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-core kmod-usb2 kmod-ath9k - BOARDNAME = C-60 + BOARDNAME := C-60 BLOCKSIZE := 64k - KERNEL_SIZE = 3648k - IMAGE_SIZE = 32m + KERNEL_SIZE := 3648k + IMAGE_SIZE := 32m IMAGES := sysupgrade.tar - MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,3648k(kernel),64k(art)ro;ar934x-nfc:32m(ubi) + MTDPARTS := spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,3648k(kernel),64k(art)ro;ar934x-nfc:32m(ubi) KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma IMAGE/sysupgrade.tar := sysupgrade-tar endef @@ -32,24 +32,24 @@ TARGET_DEVICES += c-60 define Device/domywifi-dw33d DEVICE_TITLE := DomyWifi DW33D DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x - BOARDNAME = DW33D - IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | check-size $$$$(IMAGE_SIZE) + BOARDNAME := DW33D + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 14528k | append-kernel | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += domywifi-dw33d define Device/hiveap-121 DEVICE_TITLE := Aerohive HiveAP-121 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-i2c-gpio-custom kmod-spi-gpio kmod-ath9k kmod-tpm-i2c-atmel - BOARDNAME = HiveAP-121 + BOARDNAME := HiveAP-121 BLOCKSIZE := 128k PAGESIZE := 2048 IMAGE_SIZE := 115m KERNEL_SIZE := 5120k UBINIZE_OPTS := -E 5 - CONSOLE = ttyS0,9600 - MTDPARTS = spi0.0:512k(u-boot)ro,64k(u-boot-env),64k(hw-info)ro,64k(boot-info)ro,64k(boot-sinfo)ro;ar934x-nfc:4096k(u-boot-1),4096k(u-boot-env-1),5m(kernel),111m(ubi),4096k(wifi-info)ro + CONSOLE := ttyS0,9600 + MTDPARTS := spi0.0:512k(u-boot)ro,64k(u-boot-env),64k(hw-info)ro,64k(boot-info)ro,64k(boot-sinfo)ro;ar934x-nfc:4096k(u-boot-1),4096k(u-boot-env-1),5m(kernel),111m(ubi),4096k(wifi-info)ro IMAGES := sysupgrade.tar factory.bin KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE) @@ -60,9 +60,9 @@ TARGET_DEVICES += hiveap-121 define Device/mr18 DEVICE_TITLE := Meraki MR18 DEVICE_PACKAGES := kmod-spi-gpio kmod-ath9k - BOARDNAME = MR18 + BOARDNAME := MR18 BLOCKSIZE := 64k - MTDPARTS = ar934x-nfc:512k(nandloader)ro,8M(kernel),8M(recovery),113664k(ubi),128k@130944k(odm-caldata)ro + MTDPARTS := ar934x-nfc:512k(nandloader)ro,8M(kernel),8M(recovery),113664k(ubi),128k@130944k(odm-caldata)ro IMAGES := sysupgrade.tar KERNEL := kernel-bin | patch-cmdline | MerakiNAND KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND @@ -73,9 +73,9 @@ TARGET_DEVICES += mr18 define Device/rambutan DEVICE_TITLE := 8devices Rambutan DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = RAMBUTAN - BLOCKSIZE = 128KiB - MTDPARTS = ar934x-nfc:3M(u-boot)ro,2M(u-boot-env),1M(art),122M(ubi) + BOARDNAME := RAMBUTAN + BLOCKSIZE := 128KiB + MTDPARTS := ar934x-nfc:3M(u-boot)ro,2M(u-boot-env),1M(art),122M(ubi) PAGESIZE := 2048 KERNEL_IN_UBI := 1 IMAGES := factory.ubi sysupgrade.tar @@ -87,9 +87,9 @@ TARGET_DEVICES += rambutan define Device/z1 DEVICE_TITLE := Meraki Z1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-spi-gpio kmod-ath9k kmod-owl-loader - BOARDNAME = Z1 + BOARDNAME := Z1 BLOCKSIZE := 64k - MTDPARTS = ar934x-nfc:128K(loader1)ro,8064K(kernel),128K(loader2)ro,8064K(recovery),114560K(ubi),128K(origcaldata)ro + MTDPARTS := ar934x-nfc:128K(loader1)ro,8064K(kernel),128K(loader2)ro,8064K(recovery),114560K(ubi),128K(origcaldata)ro IMAGES := sysupgrade.tar KERNEL := kernel-bin | patch-cmdline | MerakiNAND-old KERNEL_INITRAMFS := kernel-bin | patch-cmdline | MerakiNAND-old diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 8cc3a040c8..5ac641bf36 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -262,7 +262,7 @@ define Device/tl-wdr4310-v1 DEVICE_TITLE := TP-LINK TL-WDR4310 v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := TL-WDR4300 - DEVICE_PROFILE = TLWDR4300 + DEVICE_PROFILE := TLWDR4300 TPLINK_HWID := 0x43100001 endef @@ -279,8 +279,8 @@ define Device/tl-wdr6500-v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-combined - BOARDNAME = TL-WDR6500-v2 - DEVICE_PROFILE = TLWDR6500V2 + BOARDNAME := TL-WDR6500-v2 + DEVICE_PROFILE := TLWDR6500V2 TPLINK_HWID := 0x65000002 TPLINK_HEADER_VERSION := 2 endef @@ -290,8 +290,8 @@ define Device/tl-wdr3320-v2 $(Device/tplink-4mlzma) DEVICE_TITLE := TP-LINK TL-WDR3320 v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - BOARDNAME = TL-WDR3320-v2 - DEVICE_PROFILE = TLWDR3320V2 + BOARDNAME := TL-WDR3320-v2 + DEVICE_PROFILE := TLWDR3320V2 TPLINK_HWID := 0x33200002 TPLINK_HEADER_VERSION := 2 endef diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index 17b6739685..8b4b068925 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -40,48 +40,48 @@ define Device/ubnt-xm DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 DEVICE_PROFILE := UBNT IMAGE_SIZE := 7552k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro UBNT_TYPE := XM UBNT_BOARD := XM UBNT_CHIP := ar7240 IMAGES := sysupgrade.bin factory.bin - IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split endef define Device/ubnt-xw DEVICE_PACKAGES := kmod-usb-core kmod-usb2 DEVICE_PROFILE := UBNT IMAGE_SIZE := 7552k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro UBNT_TYPE := XW UBNT_BOARD := XM UBNT_CHIP := ar934x IMAGES := sysupgrade.bin factory.bin - IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split endef define Device/ubnt-bz DEVICE_PACKAGES := kmod-usb-core kmod-usb2 DEVICE_PROFILE := UBNT IMAGE_SIZE := 7552k - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro UBNT_TYPE := BZ UBNT_BOARD := XM UBNT_CHIP := ar934x IMAGES := sysupgrade.bin factory.bin - IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split endef define Device/ubnt-unifiac DEVICE_PACKAGES := kmod-usb-core kmod-usb2 DEVICE_PROFILE := UBNT IMAGE_SIZE := 7744k - MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro + MTDPARTS := spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/rw2458n @@ -185,7 +185,7 @@ define Device/ubnt-air-gateway UBNT_BOARD := XM UBNT_TYPE := AirGW UBNT_CHIP := ar933x - CONSOLE = ttyATH0,115200 + CONSOLE := ttyATH0,115200 endef TARGET_DEVICES += ubnt-air-gateway @@ -214,8 +214,8 @@ define Device/ubnt-routerstation DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 IMAGE_SIZE := 16128k IMAGES := sysupgrade.bin factory.bin - IMAGE/factory.bin = append-rootfs | pad-rootfs | mkubntimage - IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) KERNEL := kernel-bin | patch-cmdline | lzma | pad-to $$(BLOCKSIZE) endef @@ -261,8 +261,8 @@ define Device/ubnt-uap-pro DEVICE_PROFILE := UBNT UAPPRO KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 kernel0 IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage2 + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage2 endef define Device/ubnt-unifi-outdoor-plus -- 2.30.2