[PATCH v2] nitrogen6x: Remove extra quotes in fdtfile

[sbabic]

> 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 
> Reviewed-by: Fabio Estevam 
> Acked-by: Troy Kisky 
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=

Re: [PATCH v2] nitrogen6x: Remove extra quotes in fdtfile

[Troy Kisky]

On 9/27/2022 7:24 AM, Ariel D'Alessandro 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 
> Reviewed-by: Fabio Estevam 
> ---
>  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=0x\0" \
>   "initrd_high=0x\0" \
>   "fdt_addr_r=0x1800\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" \

Acked-by: Troy Kisky 

[PATCH v2] nitrogen6x: Remove extra quotes in fdtfile

[Ariel D'Alessandro]

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 
Reviewed-by: Fabio Estevam 
---
 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=0x\0" \
"initrd_high=0x\0" \
"fdt_addr_r=0x1800\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" \
-- 
2.37.2