diff options
| author | Paul Spooren <mail@aparcar.org> | 2019-06-16 21:34:46 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2019-07-04 15:50:17 +0200 |
| commit | 8c3dbaf8b49233e275b2dce4e30dc0a2bf8c86c5 (patch) | |
| tree | b58ad085eae892fa35cb6e7a8f0b09373b5c4d3e /include | |
| parent | cb689f2723b40c96426ac69f1478530ff1d48368 (diff) | |
| download | upstream-8c3dbaf8b49233e275b2dce4e30dc0a2bf8c86c5.tar.gz upstream-8c3dbaf8b49233e275b2dce4e30dc0a2bf8c86c5.tar.bz2 upstream-8c3dbaf8b49233e275b2dce4e30dc0a2bf8c86c5.zip | |
ath79: split DEVICE_TITLE in multiple variables
This allows the definition of DEVICE_VENDOR, DEVICE_MODEL and
DEVICE_VARIANT. All three are merged together to look the same as the
current DEVICE_TITLE. Also, if DEVICE_TITLE is set it's directly used as
a *fallback* for devices which weren't upgraded yet.
This is based on the work of @sudhanshu16.
The motivation is to create JSON files based on provided metadata,
needing clear differentiation between vendor, model and revision.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk index 855e391b46..e55ac22d0d 100644 --- a/include/image.mk +++ b/include/image.mk @@ -361,7 +361,10 @@ $(KDIR)/root.%: kernel_prepare define Device/InitProfile PROFILES := $(PROFILE) - DEVICE_TITLE := + DEVICE_TITLE = $$(DEVICE_VENDOR) $$(DEVICE_MODEL)$$(if $$(DEVICE_VARIANT), $$(DEVICE_VARIANT)) + DEVICE_VENDOR := + DEVICE_MODEL := + DEVICE_VARIANT := DEVICE_PACKAGES := DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE) endef @@ -420,7 +423,8 @@ DEFAULT_DEVICE_VARS := \ CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \ - IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH + IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH DEVICE_VENDOR \ + DEVICE_MODEL DEVICE_VARIANT define Device/ExportVar $(1) : $(2):=$$($(2)) |