From: Michael Pratt Date: Fri, 12 Feb 2021 18:24:32 +0000 (-0500) Subject: ath79: rename 'engenius' Makefile definitions to 'senao' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=70bf4a979c24a5db6f29f6dd691e20eb2345b4d0;p=openwrt%2Fstaging%2Fdangole.git ath79: rename 'engenius' Makefile definitions to 'senao' These recipes and definitions can apply to devices from other vendors with PCB boards or SDK produced by Senao not only the brand Engenius possible examples: Extreme Networks, WatchGuard, OpenMesh, Fortinet, ALLNET, OCEDO, Plasma Cloud, devolo, etc. so rename all of these items and move DEVICE_VENDOR from common to generic/tiny.mk Signed-off-by: Michael Pratt --- diff --git a/target/linux/ath79/image/common-engenius.mk b/target/linux/ath79/image/common-engenius.mk deleted file mode 100644 index 56e8f8cf67..0000000000 --- a/target/linux/ath79/image/common-engenius.mk +++ /dev/null @@ -1,33 +0,0 @@ -DEVICE_VARS += ENGENIUS_IMGNAME - -# This needs to make /tmp/_sys/sysupgrade.tgz an empty file prior to -# sysupgrade, as otherwise it will implant the old configuration from -# OEM firmware when writing rootfs from factory.bin -define Build/engenius-tar-gz - -[ -f "$@" ] && \ - mkdir -p $@.tmp && \ - touch $@.tmp/failsafe.bin && \ - echo '#!/bin/sh' > $@.tmp/before-upgrade.sh && \ - echo ': > /tmp/_sys/sysupgrade.tgz' >> $@.tmp/before-upgrade.sh && \ - $(CP) $(KDIR)/loader-$(DEVICE_NAME).uImage \ - $@.tmp/openwrt-$(word 1,$(1))-uImage-lzma.bin && \ - $(CP) $@ $@.tmp/openwrt-$(word 1,$(1))-root.squashfs && \ - $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \ - $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ - -C $@.tmp . | gzip -9n > $@ && \ - rm -rf $@.tmp -endef - -define Device/engenius_loader_okli - DEVICE_VENDOR := EnGenius - KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 - LOADER_TYPE := bin - COMPILE := loader-$(1).bin loader-$(1).uImage - COMPILE/loader-$(1).bin := loader-okli-compile - COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | \ - uImage lzma - IMAGES += factory.bin - IMAGE/factory.bin := append-squashfs-fakeroot-be | pad-to $$$$(BLOCKSIZE) | \ - append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ - check-size | engenius-tar-gz $$$$(ENGENIUS_IMGNAME) -endef diff --git a/target/linux/ath79/image/common-senao.mk b/target/linux/ath79/image/common-senao.mk new file mode 100644 index 0000000000..dd1a53c969 --- /dev/null +++ b/target/linux/ath79/image/common-senao.mk @@ -0,0 +1,32 @@ +DEVICE_VARS += SENAO_IMGNAME + +# This needs to make /tmp/_sys/sysupgrade.tgz an empty file prior to +# sysupgrade, as otherwise it will implant the old configuration from +# OEM firmware when writing rootfs from factory.bin +define Build/senao-tar-gz + -[ -f "$@" ] && \ + mkdir -p $@.tmp && \ + touch $@.tmp/failsafe.bin && \ + echo '#!/bin/sh' > $@.tmp/before-upgrade.sh && \ + echo ': > /tmp/_sys/sysupgrade.tgz' >> $@.tmp/before-upgrade.sh && \ + $(CP) $(KDIR)/loader-$(DEVICE_NAME).uImage \ + $@.tmp/openwrt-$(word 1,$(1))-uImage-lzma.bin && \ + $(CP) $@ $@.tmp/openwrt-$(word 1,$(1))-root.squashfs && \ + $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \ + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ + -C $@.tmp . | gzip -9n > $@ && \ + rm -rf $@.tmp +endef + +define Device/senao_loader_okli + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 + LOADER_TYPE := bin + COMPILE := loader-$(1).bin loader-$(1).uImage + COMPILE/loader-$(1).bin := loader-okli-compile + COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | lzma | \ + uImage lzma + IMAGES += factory.bin + IMAGE/factory.bin := append-squashfs-fakeroot-be | pad-to $$$$(BLOCKSIZE) | \ + append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | \ + check-size | senao-tar-gz $$$$(SENAO_IMGNAME) +endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 6eda757445..759f94e5d3 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1,6 +1,6 @@ include ./common-buffalo.mk -include ./common-engenius.mk include ./common-netgear.mk +include ./common-senao.mk include ./common-tp-link.mk include ./common-yuncore.mk @@ -966,34 +966,37 @@ endef TARGET_DEVICES += embeddedwireless_dorin define Device/engenius_eap1200h - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := qca9557 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := EAP1200H DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct IMAGE_SIZE := 11520k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := ar71xx-generic-eap1200h + SENAO_IMGNAME := ar71xx-generic-eap1200h endef TARGET_DEVICES += engenius_eap1200h define Device/engenius_eap300-v2 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar9341 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := EAP300 DEVICE_VARIANT := v2 IMAGE_SIZE := 12032k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := senao-eap300v2 + SENAO_IMGNAME := senao-eap300v2 endef TARGET_DEVICES += engenius_eap300-v2 define Device/engenius_eap600 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar9344 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := EAP600 IMAGE_SIZE := 12032k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := senao-eap600 + SENAO_IMGNAME := senao-eap600 endef TARGET_DEVICES += engenius_eap600 @@ -1024,36 +1027,39 @@ endef TARGET_DEVICES += engenius_ecb1750 define Device/engenius_ecb600 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar9344 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := ECB600 IMAGE_SIZE := 12032k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := senao-ecb600 + SENAO_IMGNAME := senao-ecb600 endef TARGET_DEVICES += engenius_ecb600 define Device/engenius_ens202ext-v1 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar9341 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := ENS202EXT DEVICE_VARIANT := v1 DEVICE_PACKAGES := rssileds IMAGE_SIZE := 12032k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := senao-ens202ext + SENAO_IMGNAME := senao-ens202ext endef TARGET_DEVICES += engenius_ens202ext-v1 define Device/engenius_enstationac-v1 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := qca9557 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := EnStationAC DEVICE_VARIANT := v1 DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct rssileds IMAGE_SIZE := 11520k LOADER_FLASH_OFFS := 0x230000 - ENGENIUS_IMGNAME := ar71xx-generic-enstationac + SENAO_IMGNAME := ar71xx-generic-enstationac endef TARGET_DEVICES += engenius_enstationac-v1 diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 36d2818ad5..dec3cd368d 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -1,5 +1,5 @@ include ./common-buffalo.mk -include ./common-engenius.mk +include ./common-senao.mk define Device/buffalo_whr-g301n $(Device/buffalo_common) @@ -32,36 +32,39 @@ endef TARGET_DEVICES += dlink_dir-615-e4 define Device/engenius_eap350-v1 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar7242 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := EAP350 DEVICE_VARIANT := v1 IMAGE_SIZE := 4864k LOADER_FLASH_OFFS := 0x1b0000 - ENGENIUS_IMGNAME := senao-eap350 + SENAO_IMGNAME := senao-eap350 endef TARGET_DEVICES += engenius_eap350-v1 define Device/engenius_ecb350-v1 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar7242 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := ECB350 DEVICE_VARIANT := v1 IMAGE_SIZE := 4864k LOADER_FLASH_OFFS := 0x1b0000 - ENGENIUS_IMGNAME := senao-ecb350 + SENAO_IMGNAME := senao-ecb350 endef TARGET_DEVICES += engenius_ecb350-v1 define Device/engenius_enh202-v1 - $(Device/engenius_loader_okli) + $(Device/senao_loader_okli) SOC := ar7240 + DEVICE_VENDOR := EnGenius DEVICE_MODEL := ENH202 DEVICE_VARIANT := v1 DEVICE_PACKAGES := rssileds IMAGE_SIZE := 4864k LOADER_FLASH_OFFS := 0x1b0000 - ENGENIUS_IMGNAME := senao-enh202 + SENAO_IMGNAME := senao-enh202 endef TARGET_DEVICES += engenius_enh202-v1