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>

diff --git a/include/image.mk b/include/image.mk
index 87ba60d9541b2cdc7f412e6c908e9272c8676fe2..b801ef993c310c1acafb4b635211e585dddeb588 100644 (file)
--- 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 9aa2a19e45d585a5065981adf17d044770545599..0c441b93344bd8b025aa0043d9c76e16c52420e4 100755 (executable)
--- 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())):