summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c4
-rw-r--r--board/freescale/imx8qm_mek/imx8qm_mek.c4
-rw-r--r--board/freescale/imx8qxp_mek/imx8qxp_mek.c4
-rw-r--r--configs/imx8dx_17x17_val_defconfig2
-rw-r--r--configs/imx8mm_ddr3l_val_defconfig2
-rw-r--r--configs/imx8mm_ddr4_evk_defconfig2
-rw-r--r--configs/imx8mm_ddr4_evk_nand_defconfig2
-rw-r--r--configs/imx8mm_ddr4_val_defconfig2
-rw-r--r--configs/imx8mm_evk_defconfig2
-rw-r--r--configs/imx8mm_evk_fspi_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_dual_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_trusty_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_android_uuu_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_defconfig2
-rw-r--r--configs/imx8mn_ddr4_evk_nom_defconfig2
-rw-r--r--configs/imx8mq_ddr3l_arm2_defconfig4
-rw-r--r--configs/imx8mq_ddr4_arm2_defconfig2
-rw-r--r--configs/imx8mq_ddr4_arm2_nand_defconfig2
-rw-r--r--configs/imx8qm_ddr4_arm2_defconfig2
-rw-r--r--configs/imx8qm_lpddr4_arm2_android_defconfig2
-rw-r--r--configs/imx8qm_lpddr4_arm2_defconfig2
-rw-r--r--configs/imx8qm_lpddr4_arm2_fspi_defconfig2
-rw-r--r--configs/imx8qxp_17x17_val_defconfig2
-rw-r--r--configs/imx8qxp_ddr3_arm2_defconfig2
-rw-r--r--configs/imx8qxp_lpddr4_arm2_android_defconfig2
-rw-r--r--configs/imx8qxp_lpddr4_arm2_defconfig2
-rw-r--r--configs/imx8qxp_lpddr4_arm2_fspi_defconfig2
-rw-r--r--configs/imx8qxp_lpddr4_arm2_nand_defconfig2
-rw-r--r--include/configs/imx8dxl_phantom_mek.h6
-rw-r--r--include/configs/imx8mm_evk.h4
-rw-r--r--include/configs/imx8mn_evk.h4
-rw-r--r--include/configs/imx8mq_aiy.h2
-rw-r--r--include/configs/imx8mq_evk.h6
-rw-r--r--include/configs/imx8qm_arm2.h2
-rw-r--r--include/configs/imx8qm_mek.h6
-rw-r--r--include/configs/imx8qxp_mek.h6
39 files changed, 53 insertions, 53 deletions
diff --git a/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c b/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
index decb526351..f8f5c93096 100644
--- a/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
+++ b/board/freescale/imx8dxl_phantom_mek/imx8dxl_phantom_mek.c
@@ -266,9 +266,9 @@ int board_late_init(void)
if (fdt_file && !strcmp(fdt_file, "undefined")) {
if (m4_boot)
- env_set("fdt_file", "fsl-imx8dxl-phantom-mek-rpmsg.dtb");
+ env_set("fdt_file", "imx8dxl-phantom-mek-rpmsg.dtb");
else
- env_set("fdt_file", "fsl-imx8dxl-phantom-mek.dtb");
+ env_set("fdt_file", "imx8dxl-phantom-mek.dtb");
}
#ifdef CONFIG_ENV_IS_IN_MMC
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index f3444329f6..4bd6fd9742 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -432,9 +432,9 @@ int board_late_init(void)
if (fdt_file && !strcmp(fdt_file, "undefined")) {
if (m4_boot)
- env_set("fdt_file", "fsl-imx8qm-mek-rpmsg.dtb");
+ env_set("fdt_file", "imx8qm-mek-rpmsg.dtb");
else
- env_set("fdt_file", "fsl-imx8qm-mek.dtb");
+ env_set("fdt_file", "imx8qm-mek.dtb");
}
#ifdef CONFIG_ENV_IS_IN_MMC
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index aedf1835bc..979df98940 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -440,9 +440,9 @@ int board_late_init(void)
if (fdt_file && !strcmp(fdt_file, "undefined")) {
if (m4_boot)
- env_set("fdt_file", "fsl-imx8qxp-mek-rpmsg.dtb");
+ env_set("fdt_file", "imx8qxp-mek-rpmsg.dtb");
else
- env_set("fdt_file", "fsl-imx8qxp-mek.dtb");
+ env_set("fdt_file", "imx8qxp-mek.dtb");
}
#ifdef CONFIG_ENV_IS_IN_MMC
diff --git a/configs/imx8dx_17x17_val_defconfig b/configs/imx8dx_17x17_val_defconfig
index 8b609fc7c0..3df47e3f81 100644
--- a/configs/imx8dx_17x17_val_defconfig
+++ b/configs/imx8dx_17x17_val_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8dx-17x17-val"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8dx-17x17-val.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8dx-17x17-val.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8mm_ddr3l_val_defconfig b/configs/imx8mm_ddr3l_val_defconfig
index a2e8ddb32b..81e745c03f 100644
--- a/configs/imx8mm_ddr3l_val_defconfig
+++ b/configs/imx8mm_ddr3l_val_defconfig
@@ -22,7 +22,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr3l-val"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr3l-val.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-ddr3l-val.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mm_ddr4_evk_defconfig b/configs/imx8mm_ddr4_evk_defconfig
index 981474aae4..4394608793 100644
--- a/configs/imx8mm_ddr4_evk_defconfig
+++ b/configs/imx8mm_ddr4_evk_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
diff --git a/configs/imx8mm_ddr4_evk_nand_defconfig b/configs/imx8mm_ddr4_evk_nand_defconfig
index 1230d56c45..87bf123bf2 100644
--- a/configs/imx8mm_ddr4_evk_nand_defconfig
+++ b/configs/imx8mm_ddr4_evk_nand_defconfig
@@ -22,7 +22,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-ddr4-evk.dtb"
CONFIG_CMD_I2C=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_CACHE=y
diff --git a/configs/imx8mm_ddr4_val_defconfig b/configs/imx8mm_ddr4_val_defconfig
index aadc017757..00f39be43b 100644
--- a/configs/imx8mm_ddr4_val_defconfig
+++ b/configs/imx8mm_ddr4_val_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr4-val"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr4-val.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-ddr4-val.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 478ddde773..d4db86c25e 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig
index c68aa947f3..5dcf608394 100644
--- a/configs/imx8mm_evk_fspi_defconfig
+++ b/configs/imx8mm_evk_fspi_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mm-evk.dtb"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig
index c41d15064c..d711b5c768 100644
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SF=y
diff --git a/configs/imx8mn_ddr4_evk_android_dual_defconfig b/configs/imx8mn_ddr4_evk_android_dual_defconfig
index cfabfd43c3..be77f5c697 100644
--- a/configs/imx8mn_ddr4_evk_android_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_dual_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SF=y
diff --git a/configs/imx8mn_ddr4_evk_android_trusty_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_defconfig
index 13b2639dd8..ba32356941 100644
--- a/configs/imx8mn_ddr4_evk_android_trusty_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
index 309e895881..e3adea878d 100644
--- a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
index 876440405f..5e1798206a 100644
--- a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mn_ddr4_evk_android_uuu_defconfig b/configs/imx8mn_ddr4_evk_android_uuu_defconfig
index 3157570333..e5f9e68ba8 100644
--- a/configs/imx8mn_ddr4_evk_android_uuu_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_uuu_defconfig
@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SF=y
diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig
index 88e6c53ebd..3291e125f0 100644
--- a/configs/imx8mn_ddr4_evk_defconfig
+++ b/configs/imx8mn_ddr4_evk_defconfig
@@ -22,7 +22,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SF=y
diff --git a/configs/imx8mn_ddr4_evk_nom_defconfig b/configs/imx8mn_ddr4_evk_nom_defconfig
index 9d70fbca19..1bdc00f8bd 100644
--- a/configs/imx8mn_ddr4_evk_nom_defconfig
+++ b/configs/imx8mn_ddr4_evk_nom_defconfig
@@ -22,7 +22,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mn-ddr4-evk"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mn-ddr4-evk.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
diff --git a/configs/imx8mq_ddr3l_arm2_defconfig b/configs/imx8mq_ddr3l_arm2_defconfig
index 2d453113ad..b5bc19733d 100644
--- a/configs/imx8mq_ddr3l_arm2_defconfig
+++ b/configs/imx8mq_ddr3l_arm2_defconfig
@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x40200000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_IMX8MQ_DDR3L_ARM2=y
CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mq-ddr3l-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mq-ddr3l-arm2.dtb"
CONFIG_NR_DRAM_BANKS=1
CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL=y
@@ -80,4 +80,4 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SF_DEFAULT_BUS=0
CONFIG_SF_DEFAULT_CS=1
CONFIG_SF_DEFAULT_SPEED=40000000
-CONFIG_SF_DEFAULT_MODE=0 \ No newline at end of file
+CONFIG_SF_DEFAULT_MODE=0
diff --git a/configs/imx8mq_ddr4_arm2_defconfig b/configs/imx8mq_ddr4_arm2_defconfig
index c4d810c64e..37fa43ff2e 100644
--- a/configs/imx8mq_ddr4_arm2_defconfig
+++ b/configs/imx8mq_ddr4_arm2_defconfig
@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x40200000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_IMX8MQ_DDR4_ARM2=y
CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mq-ddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mq-ddr4-arm2.dtb"
CONFIG_NR_DRAM_BANKS=2
CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL=y
diff --git a/configs/imx8mq_ddr4_arm2_nand_defconfig b/configs/imx8mq_ddr4_arm2_nand_defconfig
index a3f72ec922..08f2c231e9 100644
--- a/configs/imx8mq_ddr4_arm2_nand_defconfig
+++ b/configs/imx8mq_ddr4_arm2_nand_defconfig
@@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x40200000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_IMX8MQ_DDR4_ARM2=y
CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8mq-ddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8mq-ddr4-arm2.dtb"
CONFIG_NR_DRAM_BANKS=2
CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL=y
diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig
index f66dc11ab5..eae8c9a55d 100644
--- a/configs/imx8qm_ddr4_arm2_defconfig
+++ b/configs/imx8qm_ddr4_arm2_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-ddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qm-ddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qm-ddr4-arm2.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qm_lpddr4_arm2_android_defconfig b/configs/imx8qm_lpddr4_arm2_android_defconfig
index 1c019ce8fd..919e1681d8 100644
--- a/configs/imx8qm_lpddr4_arm2_android_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_android_defconfig
@@ -41,7 +41,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qm-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qm-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig
index f6e1c449ad..f3265ca623 100644
--- a/configs/imx8qm_lpddr4_arm2_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qm-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qm-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
index 7ae5257400..0be5d91a00 100644
--- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
@@ -44,7 +44,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qm-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qm-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_17x17_val_defconfig b/configs/imx8qxp_17x17_val_defconfig
index a26836791c..d0c6c87aaa 100644
--- a/configs/imx8qxp_17x17_val_defconfig
+++ b/configs/imx8qxp_17x17_val_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-17x17-val"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-17x17-val.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-17x17-val.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig
index 34958e4bd6..779b493500 100644
--- a/configs/imx8qxp_ddr3_arm2_defconfig
+++ b/configs/imx8qxp_ddr3_arm2_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-ddr3l-val.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-ddr3l-val.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_lpddr4_arm2_android_defconfig b/configs/imx8qxp_lpddr4_arm2_android_defconfig
index 1508d6c8af..fc01a1cf52 100644
--- a/configs/imx8qxp_lpddr4_arm2_android_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_android_defconfig
@@ -41,7 +41,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig
index c56bae2079..4841c71c70 100644
--- a/configs/imx8qxp_lpddr4_arm2_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
index 4b758810cd..66b892215b 100644
--- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
@@ -44,7 +44,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-lpddr4-arm2.dtb"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPL_DM=y
CONFIG_SPL_CLK=y
diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
index 980ed443fc..13f083d516 100644
--- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
@@ -39,7 +39,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2-gpmi-nand"
-CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2-gpmi-nand.dtb"
+CONFIG_DEFAULT_FDT_FILE="imx8qxp-lpddr4-arm2-gpmi-nand.dtb"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_SPL_DM=y
CONFIG_CLK_IMX8=y
diff --git a/include/configs/imx8dxl_phantom_mek.h b/include/configs/imx8dxl_phantom_mek.h
index 15bf04c8b9..d94ad9fac8 100644
--- a/include/configs/imx8dxl_phantom_mek.h
+++ b/include/configs/imx8dxl_phantom_mek.h
@@ -109,11 +109,11 @@
#define JAILHOUSE_ENV \
"jh_mmcboot=" \
- "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\
+ "setenv fdt_file imx8qxp-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run mmcboot; \0" \
"jh_netboot=" \
- "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\
+ "setenv fdt_file imx8qxp-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run netboot; \0"
@@ -122,7 +122,7 @@
"xenlinux_bootargs= \0" \
"xenlinux_console=hvc0 earlycon=xen\0" \
"xenlinux_addr=0x9e000000\0" \
- "dom0fdt_file=fsl-imx8qxp-mek-dom0.dtb\0" \
+ "dom0fdt_file=imx8qxp-mek-dom0.dtb\0" \
"xenboot_common=" \
"${get_cmd} ${loadaddr} xen;" \
"${get_cmd} ${fdt_addr} ${dom0fdt_file};" \
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 9255cfeee4..229bd60287 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -121,12 +121,12 @@
*/
#define JAILHOUSE_ENV \
"jh_clk= \0 " \
- "jh_mmcboot=mw 0x303d0518 0xff; setenv fdt_file fsl-imx8mm-evk-root.dtb;" \
+ "jh_mmcboot=mw 0x303d0518 0xff; setenv fdt_file imx8mm-evk-root.dtb;" \
"setenv jh_clk clk_ignore_unused; " \
"if run loadimage; then " \
"run mmcboot; " \
"else run jh_netboot; fi; \0" \
- "jh_netboot=mw 0x303d0518 0xff; setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
+ "jh_netboot=mw 0x303d0518 0xff; setenv fdt_file imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
#define CONFIG_MFG_ENV_SETTINGS \
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index ac91d5b11c..4d862fbdcf 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -114,12 +114,12 @@
#define JAILHOUSE_ENV \
"jh_clk= \0 " \
- "jh_mmcboot=mw 0x303d0518 0xff; setenv fdt_file fsl-imx8mn-ddr4-evk-root.dtb;" \
+ "jh_mmcboot=mw 0x303d0518 0xff; setenv fdt_file imx8mn-ddr4-evk-root.dtb;" \
"setenv jh_clk clk_ignore_unused; " \
"if run loadimage; then " \
"run mmcboot; " \
"else run jh_netboot; fi; \0" \
- "jh_netboot=mw 0x303d0518 0xff; setenv fdt_file fsl-imx8mn-ddr4-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
+ "jh_netboot=mw 0x303d0518 0xff; setenv fdt_file imx8mn-ddr4-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
#define CONFIG_MFG_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS_DEFAULT \
diff --git a/include/configs/imx8mq_aiy.h b/include/configs/imx8mq_aiy.h
index b0b7c952be..4b486d0692 100644
--- a/include/configs/imx8mq_aiy.h
+++ b/include/configs/imx8mq_aiy.h
@@ -122,7 +122,7 @@
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
- "fdt_file=fsl-imx8mq-phanbell.dtb\0" \
+ "fdt_file=imx8mq-phanbell.dtb\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 4b04801fd4..f153337a89 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -102,12 +102,12 @@
*/
#define JAILHOUSE_ENV \
"jh_clk= \0 " \
- "jh_mmcboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; " \
+ "jh_mmcboot=setenv fdt_file imx8mq-evk-root.dtb; " \
"setenv jh_clk clk_ignore_unused; " \
"if run loadimage; then " \
"run mmcboot; " \
"else run jh_netboot; fi; \0" \
- "jh_netboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
+ "jh_netboot=setenv fdt_file imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
#define CONFIG_MFG_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS_DEFAULT \
@@ -126,7 +126,7 @@
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
- "fdt_file=fsl-imx8mq-evk.dtb\0" \
+ "fdt_file=imx8mq-evk.dtb\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index 7b470a3a1e..362b9145a1 100644
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -135,7 +135,7 @@
"xenlinux_bootargs= \0" \
"xenlinux_console=hvc0 earlycon=xen\0" \
"xenlinux_addr=0x9e000000\0" \
- "dom0fdt_file=fsl-imx8qm-lpddr4-arm2-dom0.dtb\0" \
+ "dom0fdt_file=imx8qm-lpddr4-arm2-dom0.dtb\0" \
"xenboot_common=" \
"${get_cmd} ${loadaddr} xen;" \
"${get_cmd} ${fdt_addr} ${dom0fdt_file};" \
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index b85e51d4dd..474d4d6c44 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -111,11 +111,11 @@
#define JAILHOUSE_ENV \
"jh_mmcboot=" \
- "setenv fdt_file fsl-imx8qm-mek-root.dtb;"\
+ "setenv fdt_file imx8qm-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run mmcboot; \0" \
"jh_netboot=" \
- "setenv fdt_file fsl-imx8qm-mek-root.dtb;"\
+ "setenv fdt_file imx8qm-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run netboot; \0"
@@ -125,7 +125,7 @@
"xenlinux_bootargs= \0" \
"xenlinux_console=hvc0 earlycon=xen\0" \
"xenlinux_addr=0x9e000000\0" \
- "dom0fdt_file=fsl-imx8qm-mek-dom0.dtb\0" \
+ "dom0fdt_file=imx8qm-mek-dom0.dtb\0" \
"xenboot_common=" \
"${get_cmd} ${loadaddr} xen;" \
"${get_cmd} ${fdt_addr} ${dom0fdt_file};" \
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index ffffbae07c..24f8138611 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -104,11 +104,11 @@
#define JAILHOUSE_ENV \
"jh_mmcboot=" \
- "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\
+ "setenv fdt_file imx8qxp-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run mmcboot; \0" \
"jh_netboot=" \
- "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\
+ "setenv fdt_file imx8qxp-mek-root.dtb;"\
"setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \
"run netboot; \0"
@@ -117,7 +117,7 @@
"xenlinux_bootargs= \0" \
"xenlinux_console=hvc0 earlycon=xen\0" \
"xenlinux_addr=0x9e000000\0" \
- "dom0fdt_file=fsl-imx8qxp-mek-dom0.dtb\0" \
+ "dom0fdt_file=imx8qxp-mek-dom0.dtb\0" \
"xenboot_common=" \
"${get_cmd} ${loadaddr} xen;" \
"${get_cmd} ${fdt_addr} ${dom0fdt_file};" \