mirrors/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-05-05 01:46:11 +02:00
Code Issues Projects Releases Wiki Activity

imx: cortexa9: ventana, fix profiles names in profiles.json

Browse Source 
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: cbc8bcfbaa71fe0928bf07d29ec0fe6217fd51ad ("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: https://github.com/openwrt/openwrt/pull/22994
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Mario Andrés Pérez 2026-04-18 14:38:57 +02:00 committed by Hauke Mehrtens
parent 1a1bdcdc2a
commit 0d21956ecd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/imx/image/common.mk
View File

@ -18,7 +18,7 @@ define Build/imx-combined-image
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n '$(DEVICE_ID) OpenWrt bootscript' \
-d bootscript-$(DEVICE_NAME) \
-d bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
$@.boot/boot.scr
cp $@ $@.fs

10
target/linux/imx/image/cortexa9.mk
View File

@ -19,8 +19,8 @@ define Build/boot-overlay
)
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n '$(DEVICE_ID) OpenWrt bootscript' \
-d ./bootscript-$(DEVICE_NAME) \
$@.boot/6x_bootscript-$(DEVICE_NAME)
-d ./bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
$@.boot/6x_bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME))
$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
--space-fixup --compr=zlib --squash-uids \
@ -43,7 +43,7 @@ endef
define Build/recovery-scr
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n '$(DEVICE_ID) OpenWrt recovery bootscript' \
-d ./recovery-$(DEVICE_NAME) $@
-d ./recovery-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) $@
endef
define Build/apalis-emmc
@ -63,7 +63,7 @@ define Build/ventana-img
)
mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n '$(DEVICE_ID) OpenWrt bootscript' \
-d bootscript-$(DEVICE_NAME) \
-d bootscript-$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
$@.boot/boot/6x_bootscript-ventana
cp $@ $@.fs
@ -92,7 +92,7 @@ define Device/gateworks_ventana
DEVICE_VENDOR := Gateworks
DEVICE_MODEL := Ventana family
DEVICE_VARIANT := normal NAND flash
DEVICE_NAME := ventana
BOARD_NAME := ventana
DEVICE_DTS:= \
imx6dl-gw51xx \
imx6dl-gw52xx \