From 2f8269b3d8d1f2db8746ec05266a16c151af4a09 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 23 Jan 2019 01:40:41 -0800 Subject: [PATCH] MLK-20794-3 imx8qxp_arm2: Using CONFIG_DEFAULT_FDT_FILE for kernel FDT Since different ARM2/Validation boards use different kernel FDT, configure them to CONFIG_DEFAULT_FDT_FILE in defconfig Signed-off-by: Ye Li Reviewed-by: Peng Fan --- configs/imx8qxp_ddr3_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_android_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_nand_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_spl_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig | 1 + include/configs/imx8qxp_arm2.h | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index cf58702156..bf91c578c8 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-ddr3l-val.dtb" CONFIG_TARGET_IMX8QXP_DDR3_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/configs/imx8qxp_lpddr4_arm2_android_defconfig b/configs/imx8qxp_lpddr4_arm2_android_defconfig index b4f1e0546f..1fc80caa60 100644 --- a/configs/imx8qxp_lpddr4_arm2_android_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_android_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_SYS_EXTRA_OPTIONS="ANDROID_SUPPORT" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 0ff3c54d88..706d6ce988 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index c7f5eba28f..1e325c338e 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index a0d40b2930..0f1a4ff805 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/configs/imx8qxp_lpddr4_arm2_spl_defconfig b/configs/imx8qxp_lpddr4_arm2_spl_defconfig index 0371c59c71..ab79784164 100644 --- a/configs/imx8qxp_lpddr4_arm2_spl_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_spl_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig index 04512b860a..b060e039ca 100644 --- a/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_spl_nand_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-lpddr4-arm2" +CONFIG_DEFAULT_FDT_FILE="fsl-imx8qxp-lpddr4-arm2.dtb" CONFIG_TARGET_IMX8QXP_LPDDR4_ARM2=y CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_CMD_IMPORTENV=n diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index d43f9b94da..0bcc264653 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -204,7 +204,7 @@ "cntr_addr=0x88000000\0" \ "cntr_file=os_cntr_signed.bin\0" \ "boot_fdt=try\0" \ - "fdt_file=fsl-imx8qxp-lpddr4-arm2.dtb\0" \ + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \