From 70bf4a979c24a5db6f29f6dd691e20eb2345b4d0 Mon Sep 17 00:00:00 2001
From: Michael Pratt <mcpratt@pm.me>
Date: Fri, 12 Feb 2021 13:24:32 -0500
Subject: [PATCH] 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 <mcpratt@pm.me>
---
.../{common-engenius.mk => common-senao.mk} | 9 +++---
target/linux/ath79/image/generic.mk | 32 +++++++++++--------
target/linux/ath79/image/tiny.mk | 17 ++++++----
3 files changed, 33 insertions(+), 25 deletions(-)
rename target/linux/ath79/image/{common-engenius.mk => common-senao.mk} (87%)
diff --git a/target/linux/ath79/image/common-engenius.mk b/target/linux/ath79/image/common-senao.mk
similarity index 87%
rename from target/linux/ath79/image/common-engenius.mk
rename to target/linux/ath79/image/common-senao.mk
index 56e8f8cf670..dd1a53c969c 100644
--- a/target/linux/ath79/image/common-engenius.mk
+++ b/target/linux/ath79/image/common-senao.mk
@@ -1,9 +1,9 @@
-DEVICE_VARS += ENGENIUS_IMGNAME
+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/engenius-tar-gz
+define Build/senao-tar-gz
-[ -f "$@" ] && \
mkdir -p $@.tmp && \
touch $@.tmp/failsafe.bin && \
@@ -18,8 +18,7 @@ define Build/engenius-tar-gz
rm -rf $@.tmp
endef
-define Device/engenius_loader_okli
- DEVICE_VENDOR := EnGenius
+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
@@ -29,5 +28,5 @@ define Device/engenius_loader_okli
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)
+ 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 6eda757445d..759f94e5d37 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 36d2818ad51..dec3cd368db 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
--
GitLab