build: fix empty SUBTARGET in json files

Some targets like kirkwood or omap don't use a subtarget which results
in a malformed JSON info file.

Instead of having a valid value like `"target": "ath79/tiny"` for these
targets the value is `"target": "kirkwood/"`.

This patch uses the same if condition to use `generic` if the subtarget
is empty.

Tested for the kirkwood target.

Signed-off-by: Paul Spooren <mail@aparcar.org>

diff --git a/include/image.mk b/include/image.mk
index 46d592e8dca872ddf02b28be0e1a6e5c966b6d2d..fd04d4020bf6ca1d87f9159bf680d0a7d233bccd 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -588,7 +588,7 @@ define Device/Build/image
                DEVICE_ALT2_VARIANT="$(DEVICE_ALT2_VARIANT)" \
                DEVICE_TITLE="$(DEVICE_TITLE)" \
                TARGET="$(BOARD)" \
-               SUBTARGET="$(SUBTARGET)" \
+               SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
                VERSION_NUMBER="$(VERSION_NUMBER)" \
                VERSION_CODE="$(VERSION_CODE)" \
                SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \