X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2Fubnt.mk;h=dfc795bb21e145715e5653ff2da8c3f72f6522ba;hp=98c9ca0066e8a79e2e4f1d3d6fe814515a52a8d4;hb=f7a6fd31539be54d14d7c52b491b40b26bf8f740;hpb=63b525dd6b209af5554a2d053efd4b3ce6f60c9c diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index 98c9ca0066..dfc795bb21 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -1,12 +1,10 @@ -# UBNT_BOARD e.g. one of (XS2, XS5, RS, XM) -# UBNT_TYPE e.g. one of (BZ, XM, XW) -# UBNT_CHIP e.g. one of (ar7240, ar933x, ar934x) +DEVICE_VARS += UBNT_BOARD UBNT_CHIP UBNT_TYPE # mkubntimage is using the kernel image direct # routerboard creates partitions out of the ubnt header define Build/mkubntimage - $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -$(STAGING_DIR_HOST)/bin/mkfwimage \ + -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ -k $(IMAGE_KERNEL) \ -r $@ \ -o $@ @@ -15,75 +13,57 @@ endef # all UBNT XM device expect the kernel image to have 1024k while flash, when # booting the image, the size doesn't matter. define Build/mkubntimage-split - dd if=$@ of=$@.old1 bs=1024k count=1 - dd if=$@ of=$@.old2 bs=1024k skip=1 + -[ -f $@ ] && ( \ + dd if=$@ of=$@.old1 bs=1024k count=1; \ + dd if=$@ of=$@.old2 bs=1024k skip=1; \ $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ -k $@.old1 \ -r $@.old2 \ - -o $@ - rm $@.old1 $@.old2 + -o $@; \ + rm $@.old1 $@.old2 ) endef define Build/mkubntimage2 - $(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \ - -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ -p jffs2:0x50000:0xf60000:0:0:$@ \ -o $@.new @mv $@.new $@ endef -DEVICE_VARS += UBNT_BOARD UBNT_CHIP UBNT_TYPE # UBNT_BOARD e.g. one of (XS2, XS5, RS, XM) # UBNT_TYPE e.g. one of (BZ, XM, XW) # UBNT_CHIP e.g. one of (ar7240, ar933x, ar934x) -define Device/ubnt-xm - DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 +define Device/ubnt + 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 - UBNT_TYPE := XM + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro UBNT_BOARD := XM - UBNT_CHIP := ar7240 IMAGES := sysupgrade.bin factory.bin - IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage-split - IMAGE/sysupgrade.bin = append-kernel $$$$(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-xm + $(Device/ubnt) + DEVICE_PACKAGES += kmod-usb-ohci + UBNT_TYPE := XM + UBNT_CHIP := ar7240 endef define Device/ubnt-xw - 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 + $(Device/ubnt) 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 $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/ubnt-bz - 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 + $(Device/ubnt) 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 $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) -endef - -define Device/ubnt-unifiac - DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci 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 - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) + UBNT_CHIP := ar7240 endef define Device/rw2458n @@ -121,22 +101,36 @@ define Device/ubnt-unifi $(Device/ubnt-bz) DEVICE_TITLE := Ubiquiti UniFi BOARDNAME := UBNT-UF - DEVICE_PROFILE := UBNT UBNTUNIFI + DEVICE_PROFILE += UBNTUNIFI +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 + IMAGES := sysupgrade.bin + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) endef define Device/ubnt-unifiac-lite $(Device/ubnt-unifiac) DEVICE_TITLE := Ubiquiti UniFi AC-Lite DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x - DEVICE_PROFILE := UBNT UBNTUNIFIACLITE + DEVICE_PROFILE += UBNTUNIFIACLITE BOARDNAME := UBNT-UF-AC-LITE endef +define Device/ubnt-unifiac-mesh + $(Device/ubnt-unifiac-lite) + DEVICE_TITLE := Ubiquiti UniFi AC-Mesh +endef + define Device/ubnt-unifiac-pro $(Device/ubnt-unifiac) DEVICE_TITLE := Ubiquiti UniFi AC-Pro - DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2 - DEVICE_PROFILE := UBNT UBNTUNIFIACPRO + DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x + DEVICE_PROFILE += UBNTUNIFIACPRO BOARDNAME := UBNT-UF-AC-PRO endef @@ -144,9 +138,9 @@ define Device/ubnt-unifi-outdoor $(Device/ubnt-bz) DEVICE_TITLE := Ubiquiti UniFi Outdoor BOARDNAME := UBNT-U20 - DEVICE_PROFILE := UBNT UBNTUNIFIOUTDOOR + DEVICE_PROFILE += UBNTUNIFIOUTDOOR endef -TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifiac-pro ubnt-unifi-outdoor +TARGET_DEVICES += ubnt-unifi ubnt-unifiac-lite ubnt-unifiac-mesh ubnt-unifiac-pro ubnt-unifi-outdoor define Device/ubnt-nano-m-xw $(Device/ubnt-xw) @@ -171,7 +165,6 @@ define Device/ubnt-rocket-m-ti DEVICE_TITLE := Ubiquiti Rocket M TI BOARDNAME := UBNT-RM-TI UBNT_TYPE := TI - UBNT_BOARD := XM endef TARGET_DEVICES += ubnt-nano-m-xw ubnt-loco-m-xw ubnt-rocket-m-xw ubnt-rocket-m-ti @@ -179,12 +172,10 @@ define Device/ubnt-air-gateway $(Device/ubnt-xm) DEVICE_TITLE := Ubiquiti Air Gateway BOARDNAME := UBNT-AGW - UBNT_BOARD := XM UBNT_TYPE := AirGW UBNT_CHIP := ar933x - CONSOLE = ttyATH0,115200 + CONSOLE := ttyATH0,115200 endef -TARGET_DEVICES += ubnt-air-gateway define Device/ubnt-air-gateway-pro $(Device/ubnt-xm) @@ -192,9 +183,7 @@ define Device/ubnt-air-gateway-pro BOARDNAME := UBNT-AGWP UBNT_TYPE := AirGWP UBNT_CHIP := ar934x - CONSOLE = ttyS0,115200 endef -TARGET_DEVICES += ubnt-air-gateway-pro define Device/ubdev01 $(Device/ubnt-xm) @@ -202,52 +191,47 @@ define Device/ubdev01 MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7488k(firmware),64k(certs),256k(cfg)ro,64k(EEPROM)ro BOARDNAME := UBNT-UF UBNT_BOARD := UBDEV01 - UBNT_TYPE := XM - UBNT_CHIP := ar7240 endef - -TARGET_DEVICES += ubdev01 +TARGET_DEVICES += ubnt-air-gateway ubnt-air-gateway-pro ubdev01 define Device/ubnt-routerstation - DEVICE_TITLE := Ubiquiti RouterStation DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 + DEVICE_PROFILE := UBNT 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 define Device/ubnt-rs -$(Device/ubnt-routerstation) + $(Device/ubnt-routerstation) DEVICE_TITLE := Ubiquiti RouterStation BOARDNAME := UBNT-RS - DEVICE_PROFILE := Madwifi UBNT UBNTRS + DEVICE_PROFILE += UBNTRS UBNT_BOARD := RS UBNT_TYPE := RSx UBNT_CHIP := ar7100 endef define Device/ubnt-rspro -$(Device/ubnt-routerstation) + $(Device/ubnt-routerstation) DEVICE_TITLE := Ubiquiti RouterStation Pro BOARDNAME := UBNT-RSPRO - DEVICE_PROFILE := Madwifi UBNT UBNTRSPRO + DEVICE_PROFILE += UBNTRSPRO UBNT_BOARD := RSPRO UBNT_TYPE := RSPRO UBNT_CHIP := ar7100pro endef define Device/ubnt-ls-sr71 -$(Device/ubnt-routerstation) + $(Device/ubnt-routerstation) DEVICE_TITLE := Ubiquiti LS-SR71 BOARDNAME := UBNT-LS-SR71 - DEVICE_PROFILE := Madwifi UBNT UBNT_BOARD := LS-SR71 UBNT_TYPE := LS-SR71 UBNT_CHIP := ar7100 endef - TARGET_DEVICES += ubnt-rs ubnt-rspro ubnt-ls-sr71 define Device/ubnt-uap-pro @@ -261,16 +245,14 @@ 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 $$$$(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 -$(Device/ubnt-uap-pro) - DEVICE_TITLE := Ubiquiti UniFi Outdoor Pro + $(Device/ubnt-uap-pro) + DEVICE_TITLE := Ubiquiti UniFi Outdoor Plus UBNT_CHIP := ar7240 BOARDNAME := UBNT-UOP DEVICE_PROFILE := UBNT endef - -TARGET_DEVICES += ubnt-uap-pro ubnt-unifi-outdoor-plus