aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenli Looi <wlooi@ucalgary.ca>2022-11-22 18:26:34 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2023-01-25 00:42:52 +0100
commitf0e4595188db797446f7b3d29a6162ede90586a6 (patch)
tree7d333a0da28c45052cd6f924cc77840bbaa998b6
parentd5943ffed8e18e94ff71f0f1842b5137b5b795ed (diff)
downloadupstream-f0e4595188db797446f7b3d29a6162ede90586a6.tar.gz
upstream-f0e4595188db797446f7b3d29a6162ede90586a6.tar.bz2
upstream-f0e4595188db797446f7b3d29a6162ede90586a6.zip
build: add ALT3 and ALT4 vendor/model/variant
This is needed for the Netgear EX7300 series v2. Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
-rw-r--r--include/image.mk40
-rwxr-xr-xscripts/json_add_image_info.py2
2 files changed, 40 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index 87ba60d954..b801ef993c 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -333,6 +333,8 @@ define Device/InitProfile
DEVICE_ALT0_TITLE = $$(DEVICE_ALT0_VENDOR) $$(DEVICE_ALT0_MODEL)$$(if $$(DEVICE_ALT0_VARIANT), $$(DEVICE_ALT0_VARIANT))
DEVICE_ALT1_TITLE = $$(DEVICE_ALT1_VENDOR) $$(DEVICE_ALT1_MODEL)$$(if $$(DEVICE_ALT1_VARIANT), $$(DEVICE_ALT1_VARIANT))
DEVICE_ALT2_TITLE = $$(DEVICE_ALT2_VENDOR) $$(DEVICE_ALT2_MODEL)$$(if $$(DEVICE_ALT2_VARIANT), $$(DEVICE_ALT2_VARIANT))
+ DEVICE_ALT3_TITLE = $$(DEVICE_ALT3_VENDOR) $$(DEVICE_ALT3_MODEL)$$(if $$(DEVICE_ALT3_VARIANT), $$(DEVICE_ALT3_VARIANT))
+ DEVICE_ALT4_TITLE = $$(DEVICE_ALT4_VENDOR) $$(DEVICE_ALT4_MODEL)$$(if $$(DEVICE_ALT4_VARIANT), $$(DEVICE_ALT4_VARIANT))
DEVICE_VENDOR :=
DEVICE_MODEL :=
DEVICE_VARIANT :=
@@ -345,6 +347,12 @@ define Device/InitProfile
DEVICE_ALT2_VENDOR :=
DEVICE_ALT2_MODEL :=
DEVICE_ALT2_VARIANT :=
+ DEVICE_ALT3_VENDOR :=
+ DEVICE_ALT3_MODEL :=
+ DEVICE_ALT3_VARIANT :=
+ DEVICE_ALT4_VENDOR :=
+ DEVICE_ALT4_MODEL :=
+ DEVICE_ALT4_VARIANT :=
DEVICE_PACKAGES :=
DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE)
endef
@@ -424,7 +432,9 @@ DEFAULT_DEVICE_VARS := \
DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
DEVICE_ALT0_VENDOR DEVICE_ALT0_MODEL DEVICE_ALT0_VARIANT \
DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \
- DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT
+ DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT \
+ DEVICE_ALT3_VENDOR DEVICE_ALT3_MODEL DEVICE_ALT3_VARIANT \
+ DEVICE_ALT4_VENDOR DEVICE_ALT4_MODEL DEVICE_ALT4_VARIANT
define Device/ExportVar
$(1) : $(2):=$$($(2))
@@ -507,6 +517,12 @@ define Device/Build/initramfs
DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
+ DEVICE_ALT3_VENDOR="$$(DEVICE_ALT3_VENDOR)" \
+ DEVICE_ALT3_MODEL="$$(DEVICE_ALT3_MODEL)" \
+ DEVICE_ALT3_VARIANT="$$(DEVICE_ALT3_VARIANT)" \
+ DEVICE_ALT4_VENDOR="$$(DEVICE_ALT4_VENDOR)" \
+ DEVICE_ALT4_MODEL="$$(DEVICE_ALT4_MODEL)" \
+ DEVICE_ALT4_VARIANT="$$(DEVICE_ALT4_VARIANT)" \
DEVICE_TITLE="$$(DEVICE_TITLE)" \
DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
TARGET="$(BOARD)" \
@@ -615,6 +631,12 @@ define Device/Build/image
DEVICE_ALT2_VENDOR="$(DEVICE_ALT2_VENDOR)" \
DEVICE_ALT2_MODEL="$(DEVICE_ALT2_MODEL)" \
DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \
+ DEVICE_ALT3_VENDOR="$(DEVICE_ALT3_VENDOR)" \
+ DEVICE_ALT3_MODEL="$(DEVICE_ALT3_MODEL)" \
+ DEVICE_ALT3_VARIANT="$(DEVICE_ALT3_VARIANT)" \
+ DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
+ DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
+ DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
DEVICE_TITLE="$(DEVICE_TITLE)" \
DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
TARGET="$(BOARD)" \
@@ -660,6 +682,12 @@ define Device/Build/artifact
DEVICE_ALT2_VENDOR="$(DEVICE_ALT2_VENDOR)" \
DEVICE_ALT2_MODEL="$(DEVICE_ALT2_MODEL)" \
DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \
+ DEVICE_ALT3_VENDOR="$(DEVICE_ALT3_VENDOR)" \
+ DEVICE_ALT3_MODEL="$(DEVICE_ALT3_MODEL)" \
+ DEVICE_ALT3_VARIANT="$(DEVICE_ALT3_VARIANT)" \
+ DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
+ DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
+ DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
DEVICE_TITLE="$(DEVICE_TITLE)" \
DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
TARGET="$(BOARD)" \
@@ -701,6 +729,8 @@ $(if $(strip $(DEVICE_ALT0_TITLE)),Alternative device titles:
- $(DEVICE_ALT0_TITLE))
$(if $(strip $(DEVICE_ALT1_TITLE)),- $(DEVICE_ALT1_TITLE))
$(if $(strip $(DEVICE_ALT2_TITLE)),- $(DEVICE_ALT2_TITLE))
+$(if $(strip $(DEVICE_ALT3_TITLE)),- $(DEVICE_ALT3_TITLE))
+$(if $(strip $(DEVICE_ALT4_TITLE)),- $(DEVICE_ALT4_TITLE))
@@
endef
@@ -718,6 +748,14 @@ ifneq ($$(strip $$(DEVICE_ALT2_TITLE)),)
DEVICE_DISPLAY = $$(DEVICE_ALT2_TITLE) ($$(DEVICE_TITLE))
$$(info $$(call Device/DumpInfo,$(1)))
endif
+ifneq ($$(strip $$(DEVICE_ALT3_TITLE)),)
+DEVICE_DISPLAY = $$(DEVICE_ALT3_TITLE) ($$(DEVICE_TITLE))
+$$(info $$(call Device/DumpInfo,$(1)))
+endif
+ifneq ($$(strip $$(DEVICE_ALT4_TITLE)),)
+DEVICE_DISPLAY = $$(DEVICE_ALT4_TITLE) ($$(DEVICE_TITLE))
+$$(info $$(call Device/DumpInfo,$(1)))
+endif
DEVICE_DISPLAY = $$(DEVICE_TITLE)
$$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1)))))
endef
diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py
index 9aa2a19e45..0c441b9334 100755
--- a/scripts/json_add_image_info.py
+++ b/scripts/json_add_image_info.py
@@ -21,7 +21,7 @@ if not file_path.is_file():
def get_titles():
titles = []
- for prefix in ["", "ALT0_", "ALT1_", "ALT2_"]:
+ for prefix in ["", "ALT0_", "ALT1_", "ALT2_", "ALT3_", "ALT4_"]:
title = {}
for var in ["vendor", "model", "variant"]:
if getenv("DEVICE_{}{}".format(prefix, var.upper())):