public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH] board: Correct usage of fdtfile=CONFIG_DEFAULT_FDT_FILE
@ 2026-02-11 22:11 Tom Rini
  2026-02-12  2:58 ` Peng Fan
  2026-02-23 22:48 ` Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Tom Rini @ 2026-02-11 22:11 UTC (permalink / raw)
  To: u-boot
  Cc: NXP i.MX U-Boot Team, Alice Guo, Christoph Stoidner,
	Dominik Haller, Fabio Estevam, Garrett Giordano, Gilles Talis,
	Joseph Guo, Mathieu Othacehe, Peng Fan, Stefano Babic,
	Teresa Remmet, Wadim Egorov, upstream

As explained in commit 03d2d5fc003f ("board: sifive: unmatched: set
fdtfile with unquoted variable.") using the syntax of
'fdtfile=CONFIG_DEFAULT_FDT_FILE' in the plain text environment files
will lead to extraneous and problematic "s in the output. This is fixed
by using fdtfile=DEFAULT_FDT_FILE which was introduced recently.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
This is for the next branch currently.

Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
Cc: Alice Guo <alice.guo@nxp.com>
Cc: Christoph Stoidner <c.stoidner@phytec.de>
Cc: Dominik Haller <d.haller@phytec.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Garrett Giordano <ggiordano@phytec.com>
Cc: Gilles Talis <gilles.talis@gmail.com>
Cc: Joseph Guo <qijian.guo@nxp.com>
Cc: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@nabladev.com>
Cc: Teresa Remmet <t.remmet@phytec.de>
Cc: Wadim Egorov <w.egorov@phytec.de>
Cc: upstream@lists.phytec.de
---
 board/emcraft/imx8mp_navqp/imx8mp_navqp.env          | 2 +-
 board/nxp/imx8mm_evk/imx8mm_evk.env                  | 2 +-
 board/nxp/imx8mn_evk/imx8mn_evk.env                  | 2 +-
 board/nxp/imx8mp_evk/imx8mp_evk.env                  | 2 +-
 board/nxp/imx8mq_evk/imx8mq_evk.env                  | 2 +-
 board/nxp/imx8ulp_evk/imx8ulp_evk.env                | 2 +-
 board/nxp/imx91_evk/imx91_evk.env                    | 2 +-
 board/nxp/imx91_frdm/imx91_frdm.env                  | 2 +-
 board/nxp/imx93_evk/imx93_evk.env                    | 2 +-
 board/nxp/imx93_frdm/imx93_frdm.env                  | 2 +-
 board/nxp/imx93_qsb/imx93_qsb.env                    | 2 +-
 board/nxp/imx94_evk/imx94_evk.env                    | 2 +-
 board/nxp/imx95_evk/imx95_evk.env                    | 2 +-
 board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.env | 2 +-
 board/phytec/phycore_am62ax/phycore_am62ax.env       | 2 +-
 board/phytec/phycore_am62x/phycore_am62x.env         | 2 +-
 board/phytec/phycore_am64x/phycore_am64x.env         | 2 +-
 board/phytec/phycore_am68x/phycore_am68x.env         | 2 +-
 board/phytec/phycore_imx8mm/phycore_imx8mm.env       | 2 +-
 board/phytec/phycore_imx8mp/phycore_imx8mp.env       | 2 +-
 board/phytec/phycore_imx93/phycore_imx93.env         | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/board/emcraft/imx8mp_navqp/imx8mp_navqp.env b/board/emcraft/imx8mp_navqp/imx8mp_navqp.env
index c19fe08648a4..326023274e98 100644
--- a/board/emcraft/imx8mp_navqp/imx8mp_navqp.env
+++ b/board/emcraft/imx8mp_navqp/imx8mp_navqp.env
@@ -11,7 +11,7 @@ image=Image
 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
 fdt_addr_r=0x43000000
 boot_fdt=try
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 initrd_addr=0x43800000
 bootm_size=0x10000000
 mmcpart=1
diff --git a/board/nxp/imx8mm_evk/imx8mm_evk.env b/board/nxp/imx8mm_evk/imx8mm_evk.env
index 299b8472c74c..d59bd6fd5edc 100644
--- a/board/nxp/imx8mm_evk/imx8mm_evk.env
+++ b/board/nxp/imx8mm_evk/imx8mm_evk.env
@@ -6,7 +6,7 @@ boot_targets=mmc1 mmc2 dhcp
 bootm_size=0x10000000
 console=ttymxc1,115200
 fdt_addr_r=0x48000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x49000000
 initrd_addr=0x48080000
 image=Image
diff --git a/board/nxp/imx8mn_evk/imx8mn_evk.env b/board/nxp/imx8mn_evk/imx8mn_evk.env
index 487893f92876..cffa83bf7928 100644
--- a/board/nxp/imx8mn_evk/imx8mn_evk.env
+++ b/board/nxp/imx8mn_evk/imx8mn_evk.env
@@ -6,7 +6,7 @@ boot_targets=mmc1 mmc2 dhcp
 bootm_size=0x10000000
 console=ttymxc1,115200
 fdt_addr_r=0x48000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x49000000
 initrd_addr=0x48080000
 image=Image
diff --git a/board/nxp/imx8mp_evk/imx8mp_evk.env b/board/nxp/imx8mp_evk/imx8mp_evk.env
index 18cdf3da0568..e994b93b168d 100644
--- a/board/nxp/imx8mp_evk/imx8mp_evk.env
+++ b/board/nxp/imx8mp_evk/imx8mp_evk.env
@@ -7,7 +7,7 @@ bootm_size=0x10000000
 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
 fdt_addr_r=0x43000000
 fdt_addr=0x43000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 ip_dyn=yes
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
diff --git a/board/nxp/imx8mq_evk/imx8mq_evk.env b/board/nxp/imx8mq_evk/imx8mq_evk.env
index cab8c6b70bf3..6575dd7cb07b 100644
--- a/board/nxp/imx8mq_evk/imx8mq_evk.env
+++ b/board/nxp/imx8mq_evk/imx8mq_evk.env
@@ -5,7 +5,7 @@ boot_targets=mmc1 mmc2 dhcp
 bootm_size=0x10000000
 console=ttymxc0,115200
 fdt_addr_r=0x43000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 initrd_addr=0x43800000
 image=Image
 ip_dyn=yes
diff --git a/board/nxp/imx8ulp_evk/imx8ulp_evk.env b/board/nxp/imx8ulp_evk/imx8ulp_evk.env
index 52d7f4470297..da97631e03ee 100644
--- a/board/nxp/imx8ulp_evk/imx8ulp_evk.env
+++ b/board/nxp/imx8ulp_evk/imx8ulp_evk.env
@@ -23,7 +23,7 @@ mmcdev=CONFIG_SYS_MMC_ENV_DEV
 mmcpart=1
 image=Image
 cntr_file=os_cntr_signed.bin
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 console=ttyLP1,115200 earlycon
 bootm_size=0x10000000
 boot_fit=no
diff --git a/board/nxp/imx91_evk/imx91_evk.env b/board/nxp/imx91_evk/imx91_evk.env
index 6c10784cf61a..d669c6e31337 100644
--- a/board/nxp/imx91_evk/imx91_evk.env
+++ b/board/nxp/imx91_evk/imx91_evk.env
@@ -8,7 +8,7 @@ cntr_file=os_cntr_signed.bin
 console=ttyLP0,115200 earlycon
 fdt_addr_r=0x83000000
 fdt_addr=0x83000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
 mmcpart=1
diff --git a/board/nxp/imx91_frdm/imx91_frdm.env b/board/nxp/imx91_frdm/imx91_frdm.env
index b0450ff576c5..557e508bd6af 100644
--- a/board/nxp/imx91_frdm/imx91_frdm.env
+++ b/board/nxp/imx91_frdm/imx91_frdm.env
@@ -8,7 +8,7 @@ cntr_file=os_cntr_signed.bin
 console=ttyLP0,115200 earlycon
 fdt_addr_r=0x83000000
 fdt_addr=0x83000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
 mmcpart=1
diff --git a/board/nxp/imx93_evk/imx93_evk.env b/board/nxp/imx93_evk/imx93_evk.env
index d5ed216f54b5..b2ed1901a2b7 100644
--- a/board/nxp/imx93_evk/imx93_evk.env
+++ b/board/nxp/imx93_evk/imx93_evk.env
@@ -8,7 +8,7 @@ cntr_file=os_cntr_signed.bin
 console=ttyLP0,115200 earlycon
 fdt_addr_r=0x83000000
 fdt_addr=0x83000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
 mmcpart=1
diff --git a/board/nxp/imx93_frdm/imx93_frdm.env b/board/nxp/imx93_frdm/imx93_frdm.env
index 111f38ed72a6..9af3bdfd7145 100644
--- a/board/nxp/imx93_frdm/imx93_frdm.env
+++ b/board/nxp/imx93_frdm/imx93_frdm.env
@@ -8,7 +8,7 @@ cntr_file=os_cntr_signed.bin
 console=ttyLP0,115200
 fdt_addr_r=0x83000000
 fdt_addr=0x83000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 mmcdev=1
 mmcpart=1
diff --git a/board/nxp/imx93_qsb/imx93_qsb.env b/board/nxp/imx93_qsb/imx93_qsb.env
index 6c10784cf61a..d669c6e31337 100644
--- a/board/nxp/imx93_qsb/imx93_qsb.env
+++ b/board/nxp/imx93_qsb/imx93_qsb.env
@@ -8,7 +8,7 @@ cntr_file=os_cntr_signed.bin
 console=ttyLP0,115200 earlycon
 fdt_addr_r=0x83000000
 fdt_addr=0x83000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 image=Image
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
 mmcpart=1
diff --git a/board/nxp/imx94_evk/imx94_evk.env b/board/nxp/imx94_evk/imx94_evk.env
index 2baf1bbadcb7..894f59758125 100644
--- a/board/nxp/imx94_evk/imx94_evk.env
+++ b/board/nxp/imx94_evk/imx94_evk.env
@@ -28,7 +28,7 @@ fdt_addr=0x93000000
 cntr_addr=0xA8000000
 cntr_file=os_cntr_signed.bin
 boot_fit=no
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 bootm_size=0x10000000
 mmcdev=CONFIG_SYS_MMC_ENV_DEV
 mmcautodetect=yes
diff --git a/board/nxp/imx95_evk/imx95_evk.env b/board/nxp/imx95_evk/imx95_evk.env
index a7309d734b0d..19f9bd5c16e5 100644
--- a/board/nxp/imx95_evk/imx95_evk.env
+++ b/board/nxp/imx95_evk/imx95_evk.env
@@ -12,7 +12,7 @@ fdt_addr=0x93000000
 cntr_addr=0xA8000000
 cntr_file=os_cntr_signed.bin
 boot_fit=no
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 bootm_size=0x10000000
 mmcdev=CONFIG_ENV_MMC_DEVICE_INDEX
 mmcautodetect=yes
diff --git a/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.env b/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.env
index f064bbe3d31e..7ea7bde86a16 100644
--- a/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.env
+++ b/board/phytec/imx8mp-libra-fpsc/imx8mp-libra-fpsc.env
@@ -2,7 +2,7 @@ boot_script_dhcp=net_boot_fit.scr.uimg
 console=ttymxc3,CONFIG_BAUDRATE
 emmc_dev=2  /* This is needed by built-in uuu flash scripts */
 fdt_addr_r=0x40480000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x404a0000
 ip_dyn=yes
 kernel_addr_r=0x40a00000
diff --git a/board/phytec/phycore_am62ax/phycore_am62ax.env b/board/phytec/phycore_am62ax/phycore_am62ax.env
index eeb7cd6899ae..e7b9cc0791ca 100644
--- a/board/phytec/phycore_am62ax/phycore_am62ax.env
+++ b/board/phytec/phycore_am62ax/phycore_am62ax.env
@@ -13,7 +13,7 @@ ramdisk_addr_r=0x88080000
 fdtoverlay_addr_r=0x89000000
 fit_addr_r=0x90000000
 
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 mmcdev=1
 mmcroot=2
 mmcpart=1
diff --git a/board/phytec/phycore_am62x/phycore_am62x.env b/board/phytec/phycore_am62x/phycore_am62x.env
index eeb7cd6899ae..e7b9cc0791ca 100644
--- a/board/phytec/phycore_am62x/phycore_am62x.env
+++ b/board/phytec/phycore_am62x/phycore_am62x.env
@@ -13,7 +13,7 @@ ramdisk_addr_r=0x88080000
 fdtoverlay_addr_r=0x89000000
 fit_addr_r=0x90000000
 
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 mmcdev=1
 mmcroot=2
 mmcpart=1
diff --git a/board/phytec/phycore_am64x/phycore_am64x.env b/board/phytec/phycore_am64x/phycore_am64x.env
index 67d2b87f1442..6cfe64e676fb 100644
--- a/board/phytec/phycore_am64x/phycore_am64x.env
+++ b/board/phytec/phycore_am64x/phycore_am64x.env
@@ -12,7 +12,7 @@ ramdisk_addr_r=0x88080000
 fdtoverlay_addr_r=0x89000000
 fit_addr_r=0x90000000
 
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 mmcdev=1
 mmcroot=2
 mmcpart=1
diff --git a/board/phytec/phycore_am68x/phycore_am68x.env b/board/phytec/phycore_am68x/phycore_am68x.env
index 4908055b5425..0c61e645c88d 100644
--- a/board/phytec/phycore_am68x/phycore_am68x.env
+++ b/board/phytec/phycore_am68x/phycore_am68x.env
@@ -7,7 +7,7 @@ ramdisk_addr_r=0x88080000
 fdtoverlay_addr_r=0x89000000
 fit_addr_r=0x90000000
 
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 mmcdev=1
 mmcroot=2
 mmcpart=1
diff --git a/board/phytec/phycore_imx8mm/phycore_imx8mm.env b/board/phytec/phycore_imx8mm/phycore_imx8mm.env
index f6d0c0553b5d..7cd601f8cd58 100644
--- a/board/phytec/phycore_imx8mm/phycore_imx8mm.env
+++ b/board/phytec/phycore_imx8mm/phycore_imx8mm.env
@@ -2,7 +2,7 @@ boot_script_dhcp=net_boot_fit.scr.uimg
 console=ttymxc2,CONFIG_BAUDRATE
 emmc_dev=2  /* This is needed by built-in uuu flash scripts */
 fdt_addr_r=0x40480000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x404a0000
 ip_dyn=yes
 kernel_addr_r=0x40a00000
diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
index c339c315c308..652761d1f998 100644
--- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env
+++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
@@ -4,7 +4,7 @@ emmc_dev=2  /* This is needed by built-in uuu flash scripts */
 fastboot_raw_partition_all=0 4194304
 fastboot_raw_partition_bootloader=64 8128
 fdt_addr_r=0x48000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x49000000
 ip_dyn=yes
 kernel_addr_r=0x5A080000
diff --git a/board/phytec/phycore_imx93/phycore_imx93.env b/board/phytec/phycore_imx93/phycore_imx93.env
index 4e89c4ae26cb..c8fb3a875da0 100644
--- a/board/phytec/phycore_imx93/phycore_imx93.env
+++ b/board/phytec/phycore_imx93/phycore_imx93.env
@@ -4,7 +4,7 @@ boot_script_dhcp=net_boot_fit.scr.uimg
 console=ttyLP0
 emmc_dev=0  /* This is needed by built-in uuu flash scripts */
 fdt_addr_r=0x90000000
-fdtfile=CONFIG_DEFAULT_FDT_FILE
+fdtfile=DEFAULT_FDT_FILE
 fdtoverlay_addr_r=0x900c0000
 ip_dyn=yes
 kernel_addr_r=0x88000000
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-23 22:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-11 22:11 [PATCH] board: Correct usage of fdtfile=CONFIG_DEFAULT_FDT_FILE Tom Rini
2026-02-12  2:58 ` Peng Fan
2026-02-23 22:48 ` Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox