Skip to content

Commit 0d21956

Browse files
map-bhauke
authored andcommitted
imx: cortexa9: ventana, fix profiles names in profiles.json
These two image profiles overwrite DEVICE_NAME making the two image profiles appear with the same name "ventana" in the "profiles.json" mixing ramdomly the two profiles. Use BOARD_NAME instead to keep the two profiles names unique (orginal DEVICE_NAME) hence generating a coherent "profiles.json". Since there are image recipes hardconding DEVICE_NAME, change them to use BOARD_NAME if defined, in order to preserve the previous names used in those recipes. Fixes: cbc8bcf ("imx6: image: use vendor_model scheme") Reported-by: Eric Fahlgren <ericfahlgren@gmail.com> Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com> Link: openwrt/openwrt#22994 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 1a1bdcd commit 0d21956

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

target/linux/imx/image/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define Build/imx-combined-image
1818

1919
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
2020
-n '$(DEVICE_ID) OpenWrt bootscript' \
21-
-d bootscript-$(DEVICE_NAME) \
21+
-d bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
2222
$@.boot/boot.scr
2323

2424
cp $@ $@.fs

target/linux/imx/image/cortexa9.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ define Build/boot-overlay
1919
)
2020
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
2121
-n '$(DEVICE_ID) OpenWrt bootscript' \
22-
-d ./bootscript-$(DEVICE_NAME) \
23-
$@.boot/6x_bootscript-$(DEVICE_NAME)
22+
-d ./bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
23+
$@.boot/6x_bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME))
2424

2525
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
2626
--space-fixup --compr=zlib --squash-uids \
@@ -43,7 +43,7 @@ endef
4343
define Build/recovery-scr
4444
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
4545
-n '$(DEVICE_ID) OpenWrt recovery bootscript' \
46-
-d ./recovery-$(DEVICE_NAME) $@
46+
-d ./recovery-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) $@
4747
endef
4848

4949
define Build/apalis-emmc
@@ -63,7 +63,7 @@ define Build/ventana-img
6363
)
6464
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
6565
-n '$(DEVICE_ID) OpenWrt bootscript' \
66-
-d bootscript-$(DEVICE_NAME) \
66+
-d bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
6767
$@.boot/boot/6x_bootscript-ventana
6868
cp $@ $@.fs
6969

@@ -92,7 +92,7 @@ define Device/gateworks_ventana
9292
DEVICE_VENDOR := Gateworks
9393
DEVICE_MODEL := Ventana family
9494
DEVICE_VARIANT := normal NAND flash
95-
DEVICE_NAME := ventana
95+
BOARD_NAME := ventana
9696
DEVICE_DTS:= \
9797
imx6dl-gw51xx \
9898
imx6dl-gw52xx \

0 commit comments

Comments
 (0)