From: Ming Liu <liu.ming50@...>

We have renamed UBOOT_BINARY with '-nand' suffix to indicate it's a
image that should be flashed to NAND device, do the same to
UBOOT_IMAGE, otherwise developers might get confused about how to deal
with it.

Signed-off-by: Ming Liu <liu.ming50@...>
---
conf/machine/colibri-imx6ull.conf | 1 +
conf/machine/colibri-imx7-nand.conf | 1 +
conf/machine/colibri-vf.conf | 1 +
3 files changed, 3 insertions(+)

diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx=
6ull.conf
index 1e1fd93..896fa1c 100644
--- a/conf/machine/colibri-imx6ull.conf
+++ b/conf/machine/colibri-imx6ull.conf
@@ -22,6 +22,7 @@ PREFERRED_RPROVIDER_u-boot-fw-utils ?=3D "u-boot-torade=
x-fw-utils"
PREFERRED_PROVIDER_u-boot-default-script ?=3D "u-boot-script-toradex"
=20
UBOOT_BINARY =3D "u-boot-nand.imx"
+UBOOT_IMAGE =3D "u-boot-nand-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_MAKE_TARGET =3D "u-boot.imx"
UBOOT_MACHINE ?=3D "colibri-imx6ull_defconfig"
=20
diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-i=
mx7-nand.conf
index 4ab7a95..03794c9 100644
--- a/conf/machine/colibri-imx7-nand.conf
+++ b/conf/machine/colibri-imx7-nand.conf
@@ -35,6 +35,7 @@ PREFERRED_PROVIDER_u-boot-default-script ?=3D "u-boot-s=
cript-toradex"
=20
# U-Boot NAND binary includes 0x400 padding required for NAND boot
UBOOT_BINARY =3D "u-boot-nand.imx"
+UBOOT_IMAGE =3D "u-boot-nand-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_MAKE_TARGET =3D "u-boot.imx"
UBOOT_MACHINE ?=3D "colibri_imx7_defconfig"
=20
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 8c66ced..7e00e89 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -39,6 +39,7 @@ PREFERRED_VERSION_weston_use-nxp-bsp =3D ""
=20
# U-Boot NAND binary includes 0x400 padding required for NAND boot
UBOOT_BINARY =3D "u-boot-nand.imx"
+UBOOT_IMAGE =3D "u-boot-nand-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_MAKE_TARGET =3D "u-boot.imx"
UBOOT_MACHINE ?=3D "colibri_vf_defconfig"
=20
--=20
2.29.0

Em ter., 4 de mai. de 2021 às 09:24, Ming Liu <liu.ming50@...> escreveu:

From: Ming Liu <liu.ming50@...>

We have renamed UBOOT_BINARY with '-nand' suffix to indicate it's a
image that should be flashed to NAND device, do the same to
UBOOT_IMAGE, otherwise developers might get confused about how to deal
with it.

Signed-off-by: Ming Liu <liu.ming50@...>

Please use the GitHub for this PR. Also, please include a background
why this change is required. Up to now, it seems to be going on the
wrong direction.


--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750