X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2Fgeneric.mk;h=ae0c7fcae19e8ce8feeff803ee9ec7e4e51efd84;hp=bff3d263cc8c16dd79ce00dd0216365ae40a9891;hb=e3875350f3e4185020b64e0588bba521cd1d6e64;hpb=e767980eb897fbefc320f97b65944ce690ed1726 diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index bff3d263cc..ae0c7fcae1 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -27,6 +27,27 @@ define Device/cf-e316n-v2 endef TARGET_DEVICES += cf-e316n-v2 +define Device/domywifi-dw33d + DEVICE_TITLE := DomyWifi DW33D + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-ledtrig-usbdev kmod-ath10k + BOARDNAME = DW33D + IMAGE_SIZE = 16000k + CONSOLE = ttyS0,115200 + 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/dragino2 + BOARDNAME := DRAGINO2 + CONSOLE := ttyATH0,115200 + DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport + DEVICE_TITLE := Dragino 2 (MS14) + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,16000k(firmware),64k(config)ro,64k(art)ro +endef +TARGET_DEVICES += dragino2 + define Device/weio DEVICE_TITLE := WeIO DEVICE_PACKAGES := kmod-usb-core kmod-usb2 @@ -57,6 +78,16 @@ define Device/gl-ar300 endef TARGET_DEVICES += gl-ar300 +define Device/gl-ar300m + DEVICE_TITLE := GL AR300M + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 uboot-envtools + BOARDNAME = GL-AR300M + IMAGE_SIZE = 16000k + CONSOLE = ttyS0,115200 + 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 Domino Pi DEVICE_PACKAGES := kmod-usb-core kmod-usb2 @@ -67,6 +98,42 @@ define Device/gl-domino endef TARGET_DEVICES += gl-domino +define Device/gl-mifi + DEVICE_TITLE := 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 +endef +TARGET_DEVICES += gl-mifi + +define Device/mr12 + DEVICE_TITLE := Meraki MR12 + DEVICE_PACKAGES := kmod-spi-gpio + BOARDNAME = MR12 + 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 13440k | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGES := kernel.bin rootfs.bin sysupgrade.bin +endef +TARGET_DEVICES += mr12 + +define Device/mr16 + DEVICE_TITLE := Meraki MR16 + DEVICE_PACKAGES := kmod-spi-gpio + BOARDNAME = MR16 + 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 13440k | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGES := kernel.bin rootfs.bin sysupgrade.bin +endef +TARGET_DEVICES += mr16 + define Device/dr531 DEVICE_TITLE := Wallys DR531 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 @@ -78,7 +145,7 @@ TARGET_DEVICES += dr531 define Device/wndr3700 DEVICE_TITLE := NETGEAR WNDR3700 - DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev kmod-leds-wndr3700-usb + 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 @@ -86,7 +153,7 @@ define Device/wndr3700 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 $$$$(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) | 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) @@ -136,7 +203,7 @@ define Device/cap324 BOARDNAME := CAP324 DEVICE_PROFILE := CAP324 IMAGE_SIZE = 15296k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,15296k(firmware),640k(certs),64k(nvram),64k(art) + 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 @@ -147,7 +214,7 @@ define Device/cap324-nocloud BOARDNAME := CAP324 DEVICE_PROFILE := CAP324 IMAGE_SIZE = 16000k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,16000k(firmware),64k(art) + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro endef TARGET_DEVICES += cap324-nocloud @@ -158,7 +225,7 @@ define Device/cr3000 BOARDNAME := CR3000 DEVICE_PROFILE := CR3000 IMAGE_SIZE = 7104k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art) + 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 @@ -169,29 +236,29 @@ define Device/cr3000-nocloud BOARDNAME := CR3000 DEVICE_PROFILE := CR3000 IMAGE_SIZE = 7808k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,7808k(firmware),64k(art) + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro endef TARGET_DEVICES += cr3000-nocloud define Device/cr5000 DEVICE_TITLE := PowerCloud CR5000 Cloud Router - DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev kmod-usb-core + DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-usb-core BOARDNAME := CR5000 DEVICE_PROFILE := CR5000 IMAGE_SIZE = 7104k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,7104k(firmware),640k(certs),64k(nvram),64k(art) + 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 define Device/cr5000-nocloud DEVICE_TITLE := PowerCloud CR5000 (No-Cloud) - DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev kmod-usb-core + DEVICE_PACKAGES := uboot-envtools kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-usb-core BOARDNAME := CR5000 DEVICE_PROFILE := CR5000 IMAGE_SIZE = 7808k - MTDPARTS = spi0.0:256k(u-boot),64k(u-boot-env)ro,7808k(firmware),64k(art) + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro endef TARGET_DEVICES += cr5000-nocloud @@ -268,6 +335,15 @@ define Device/gl-inet-6416A-v1 endef 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 +endef +TARGET_DEVICES += jwap230 + define Device/rnx-n360rt $(Device/tplink-4m) DEVICE_TITLE := Rosewill RNX-N360RT @@ -281,7 +357,7 @@ TARGET_DEVICES += rnx-n360rt define Device/mc-mac1200r $(Device/tplink-8mlzma) DEVICE_TITLE := MERCURY MAC1200R - DEVICE_PACKAGES := kmod-ath10k + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x BOARDNAME := MC-MAC1200R DEVICE_PROFILE := MAC1200R TPLINK_HWID := 0x12000001 @@ -291,7 +367,7 @@ TARGET_DEVICES += mc-mac1200r define Device/minibox-v1 $(Device/tplink-16mlzma) DEVICE_TITLE := Gainstrong MiniBox V1.0 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := MINIBOX-V1 DEVICE_PROFILE := MINIBOXV1 TPLINK_HWID := 0x3C000201 @@ -362,7 +438,7 @@ TARGET_DEVICES += tellstick-znet-lite define Device/oolite $(Device/tplink-16mlzma) DEVICE_TITLE := Gainstrong OOLITE - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport BOARDNAME := GS-OOLITE DEVICE_PROFILE := OOLITE TPLINK_HWID := 0x3C000101 @@ -373,7 +449,7 @@ TARGET_DEVICES += oolite define Device/NBG6616 DEVICE_TITLE := ZyXEL NBG6616 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-usb-storage kmod-rtc-pcf8563 kmod-ath10k + 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 @@ -381,7 +457,7 @@ define Device/NBG6616 CMDLINE += mem=128M IMAGES := sysupgrade.bin KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 boot/vmlinux.lzma.uImage - IMAGE/sysupgrade.bin = append-kernel $$$$(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: @@ -414,7 +490,7 @@ define Device/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 $$$$(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) endef TARGET_DEVICES += c-55 @@ -443,55 +519,53 @@ endef TARGET_DEVICES += hiwifi-hc6361 -# The pre-filled 64 bytes consist of -# - 28 bytes seama_header -# - 36 bytes of META data (4-bytes aligned) -define Build/seama-factory - ( dd if=/dev/zero bs=64 count=1; cat $(word 1,$^) ) >$@.loader.tmp - ( dd if=$@.loader.tmp bs=64k conv=sync; dd if=$(word 2,$^) ) >$@.tmp.0 - tail -c +65 $@.tmp.0 >$@.tmp.1 - $(STAGING_DIR_HOST)/bin/seama \ - -i $@.tmp.1 \ - -m "dev=/dev/mtdblock/1" -m "type=firmware" - $(STAGING_DIR_HOST)/bin/seama \ - -s $@ \ - -m "signature=$(1)" \ - -i $@.tmp.1.seama - rm -f $@.loader.tmp $@.tmp.* -endef - -define Build/seama-sysupgrade - $(STAGING_DIR_HOST)/bin/seama \ - -i $(word 1,$^) \ - -m "dev=/dev/mtdblock/1" -m "type=firmware" - ( dd if=$(word 1,$^).seama bs=64k conv=sync; dd if=$(word 2,$^) ) >$@ - rm -f $(word 1,$^).seama -endef - -define Build/seama-initramfs - $(STAGING_DIR_HOST)/bin/seama \ - -i $@ \ - -m "dev=/dev/mtdblock/1" -m "type=firmware" +define Build/seama + $(STAGING_DIR_HOST)/bin/seama -i $@ $(if $(1),$(1),-m "dev=/dev/mtdblock/1" -m "type=firmware") mv $@.seama $@ endef -define Build/seama-pad-rootfs - $(STAGING_DIR_HOST)/bin/padjffs2 $(word 2,$^) -c 64 >>$@ +define Build/seama-seal + $(call Build/seama,-s $@.seama $(1)) endef define Device/seama CONSOLE := ttyS0,115200 LOADER_TYPE := bin - KERNEL := kernel-bin | lzma | loader-kernel-cmdline | lzma - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama-initramfs + BLOCKSIZE := 64k + KERNEL := kernel-bin | patch-cmdline | relocate-kernel | lzma + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX).seama IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin := seama-sysupgrade $$$$(SEAMA_SIGNATURE) | seama-pad-rootfs | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := seama-factory $$$$(SEAMA_SIGNATURE) | seama-pad-rootfs | check-size $$$$(IMAGE_SIZE) + + # 64 bytes offset: + # - 28 bytes seama_header + # - 36 bytes of META data (4-bytes aligned) + IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs + IMAGE/sysupgrade.bin := \ + $$(IMAGE/default) | seama | pad-rootfs | \ + check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := \ + $$(IMAGE/default) | seama | pad-rootfs | \ + seama-seal -m "signature=$$$$(SEAMA_SIGNATURE)" | \ + check-size $$$$(IMAGE_SIZE) SEAMA_SIGNATURE := DEVICE_VARS += SEAMA_SIGNATURE endef +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 + SEAMA_SIGNATURE := wrgac54_dlink.2015_dir869 + IMAGE/factory.bin := \ + $$(IMAGE/default) | pad-rootfs -x 64 | \ + seama | seama-seal -m "signature=$$$$(SEAMA_SIGNATURE)" | \ + check-size $$$$(IMAGE_SIZE) +endef + define Device/mynet-n600 $(Device/seama) DEVICE_TITLE := Western Digital My Net N600 @@ -515,11 +589,40 @@ endef define Device/qihoo-c301 $(Device/seama) DEVICE_TITLE := Qihoo C301 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k + 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) SEAMA_SIGNATURE := wrgac26_qihoo360_360rg endef -TARGET_DEVICES += mynet-n600 mynet-n750 qihoo-c301 +TARGET_DEVICES += dir-869-a1 mynet-n600 mynet-n750 qihoo-c301 + +define Build/mkwrggimg + $(STAGING_DIR_HOST)/bin/mkwrggimg -b \ + -i $@ -o $@.imghdr -d /dev/mtdblock/1 \ + -m $(BOARDNAME) -s $(DAP_SIGNATURE) \ + -v LEDE -B $(REVISION) + mv $@.imghdr $@ +endef + +define Build/wrgg-pad-rootfs + $(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@ +endef + +define Device/dap-2695-a1 + DEVICE_TITLE := D-Link DAP-2695 rev. A1 + DEVICE_PACKAGES := ath10k-firmware-qca988x kmod-ath10k uboot-envtools + 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) + 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 + DAP_SIGNATURE := wapac02_dkbs_dap2695 + DEVICE_VARS += DAP_SIGNATURE +endef + +TARGET_DEVICES += dap-2695-a1