diff options
| author | Shenwei Wang <shenwei.wang@nxp.com> | 2018-10-01 08:39:12 -0500 |
|---|---|---|
| committer | Frank Li <Frank.Li@nxp.com> | 2018-10-09 16:19:19 -0500 |
| commit | a5000879500a1fc2db2cf98cc3a161a5cf5f793a (patch) | |
| tree | dc88791cfad362b8945bdaef413c3170291b8164 | |
| parent | efa479928df176c4a94c96448978d87de004215c (diff) | |
Revert "MLK-19767: imx7ulp: configs: add a new macro for kernel dtb"
This reverts commit 26766be89286cad4946655b3004ab0fc4ef63a65.
| -rw-r--r-- | configs/mx7ulp_evk_defconfig | 1 | ||||
| -rw-r--r-- | dts/Kconfig | 4 | ||||
| -rw-r--r-- | include/configs/mx7ulp_evk.h | 9 |
3 files changed, 1 insertions, 13 deletions
diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 5aac45b877..07b9c7bf1f 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" -CONFIG_KERNEL_USE_STD_DTB="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/dts/Kconfig b/dts/Kconfig index a04be55e8e..0cef225ba9 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -29,10 +29,6 @@ config OF_CONTROL This feature provides for run-time configuration of U-Boot via a flattened device tree. -config KERNEL_USE_STD_DTB - string "Specify the dtb file name for Linux kernel" - default DEFAULT_DEVICE_TREE - config OF_BOARD_FIXUP bool "Board-specific manipulation of Device Tree" help diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 449fb3512a..bbb7cb287d 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -90,13 +90,6 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) - -#ifdef CONFIG_KERNEL_USE_STD_DTB -#define LD_FDT_FILE CONFIG_KERNEL_USE_STD_DTB -#else -#define LD_FDT_FILE CONFIG_DEFAULT_DEVICE_TREE -#endif - #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x63800000\0" \ @@ -112,7 +105,7 @@ "console=ttyLP0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=" LD_FDT_FILE ".dtb\0" \ + "fdt_file=imx7ulp-evk.dtb\0" \ "fdt_addr=0x63000000\0" \ "tee_addr=0x64000000\0" \ "tee_file=uTee-7ulp\0" \ |