[PATCH] imx6: Remove extra quotes in fdtfile environment variable

After commit 395110284b56 ("nitrogen6x: Populate FDTFILE at build-time for all platforms") iMX.6Q Sabrelite fails to boot due to a bad fdtfile string:
Retrieving file: /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb ** File not found /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb **
CONFIG_DEFAULT_DEVICE_TREE option is string typed, so __stringify() is adding extra quotes. Remove this.
Signed-off-by: Ariel D'Alessandro ariel.dalessandro@collabora.com --- include/configs/nitrogen6x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 2007b48868..26e6de2d2c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -76,7 +76,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ - "fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \ + "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

Hi Ariel,
On Tue, Sep 27, 2022 at 11:14 AM Ariel D'Alessandro ariel.dalessandro@collabora.com wrote:
After commit 395110284b56 ("nitrogen6x: Populate FDTFILE at build-time for all platforms") iMX.6Q Sabrelite fails to boot due to a bad fdtfile string:
Retrieving file: /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb ** File not found /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb **
CONFIG_DEFAULT_DEVICE_TREE option is string typed, so __stringify() is adding extra quotes. Remove this.
Signed-off-by: Ariel D'Alessandro ariel.dalessandro@collabora.com
Just a nit: in the Subject, it would be better to change it like this:
nitrogen6x: Remove extra quotes in fdtfile
Reviewed-by: Fabio Estevam festevam@denx.de
Stefano/Tom,
This is 2022.10 material IMHO.

Hi Fabio,
On 9/27/22 11:20, Fabio Estevam wrote:
Hi Ariel,
On Tue, Sep 27, 2022 at 11:14 AM Ariel D'Alessandro ariel.dalessandro@collabora.com wrote:
After commit 395110284b56 ("nitrogen6x: Populate FDTFILE at build-time for all platforms") iMX.6Q Sabrelite fails to boot due to a bad fdtfile string:
Retrieving file: /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb ** File not found /dtbs/5.18.0-0.deb11.4-armmp/"imx6q-sabrelite".dtb **
CONFIG_DEFAULT_DEVICE_TREE option is string typed, so __stringify() is adding extra quotes. Remove this.
Signed-off-by: Ariel D'Alessandro ariel.dalessandro@collabora.com
Just a nit: in the Subject, it would be better to change it like this:
nitrogen6x: Remove extra quotes in fdtfile
Makes sense. Will amend it right away.
Reviewed-by: Fabio Estevam festevam@denx.de
Stefano/Tom,
This is 2022.10 material IMHO.
Thanks!
participants (2)
-
Ariel D'Alessandro
-
Fabio Estevam