board: Correct usage of fdtfile=CONFIG_DEFAULT_FDT_FILE

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.

Acked-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/emcraft/imx8mp_navqp/imx8mp_navqp.env b/board/emcraft/imx8mp_navqp/imx8mp_navqp.env
index c19fe08648a45957d3b636ee202c6fe1667134df..326023274e98864d8d12d404ea7d2c02f8d344c0 100644 (file)
--- 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 299b8472c74cec86b870304c8c5153ac9e1c4453..d59bd6fd5edc9c086dde3dea6f9a5f6d52d41d4b 100644 (file)
--- 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 487893f928760b7498b9d2f2fd22831b0d45106e..cffa83bf792892c9a1ca25b29c108b83ba3c340c 100644 (file)
--- 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 18cdf3da0568189685ceef2b08737492db518469..e994b93b168de6e24685d1fbeb2c709f1b8900f7 100644 (file)
--- 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 cab8c6b70bf3a4673d87ebc4b2934e2fc5c86d07..6575dd7cb07bc57ce97cd406505187da161a59a5 100644 (file)
--- 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 52d7f4470297ded8fd59ef3ee262dad788ff2cbd..da97631e03ee7406e619dc656a709a28ecdb549f 100644 (file)
--- 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 6c10784cf61a9a6ee29f4c5e9c4cc41b6c8ef4dc..d669c6e313375c4eba6f86603fef00fe3fa74357 100644 (file)
--- 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 b0450ff576c50a3111fad522ab4abd7a6dc5ed93..557e508bd6afee7c9712682f5c31b6307cd56b67 100644 (file)
--- 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 d5ed216f54b51300758dd720e638cab1b6fbe3e7..b2ed1901a2b71bc8c74c924f966762f7641fc904 100644 (file)
--- 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 111f38ed72a6a2bfdeafdb0f24d05849ce06d5b3..9af3bdfd71459863352339e9ff11bf043536c58a 100644 (file)
--- 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 6c10784cf61a9a6ee29f4c5e9c4cc41b6c8ef4dc..d669c6e313375c4eba6f86603fef00fe3fa74357 100644 (file)
--- 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 2baf1bbadcb791d61c6fd511bd40865ec7bac8a9..894f59758125aab195f714f762fc995cb30a0976 100644 (file)
--- 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 a7309d734b0d3b98b2dd405a975610c24f7f6a32..19f9bd5c16e5bc614bb59553769d9941748bb933 100644 (file)
--- 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 f064bbe3d31e3ee29d13bc12bc61a7f04ecdf153..7ea7bde86a16f8992bc19e0500822e320f7d7d0b 100644 (file)
--- 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 eeb7cd6899ae6f9c4f5ec47ddc0cc2d86d473e08..e7b9cc0791cad7a2f539f0be8e7785a8579761b2 100644 (file)
--- 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 eeb7cd6899ae6f9c4f5ec47ddc0cc2d86d473e08..e7b9cc0791cad7a2f539f0be8e7785a8579761b2 100644 (file)
--- 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 67d2b87f144241bfd595465177efb9880bfd45b7..6cfe64e676fba0dd730e28952a771a727fc6ccf1 100644 (file)
--- 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 4908055b5425f0c11f0626774127540b295dac98..0c61e645c88d5459aae712658fa08eb5d66ef302 100644 (file)
--- 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 f6d0c0553b5d81e8220417efcd52ff9b1e6e4348..7cd601f8cd589e9aa56dd81c47846d68f74b6b1c 100644 (file)
--- 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 c339c315c3081f3eeb0a2ce9a2ddef83638afa68..652761d1f998a06ddf94d0a2240bc30dad994c79 100644 (file)
--- 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 4e89c4ae26cb8f3c9b83209527d0c9544277c68a..c8fb3a875da07c11915027902b284cdb3a5b6f7f 100644 (file)
--- 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