Commit 6bb52962ea928647c609bf23df9454f14bf46f15
1 parent
e9f87deae7
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
5 other branches
Revert "MLK-19767: imx7ulp: configs: add a new macro for kernel dtb"
This reverts commit 26766be89286cad4946655b3004ab0fc4ef63a65.
Showing 3 changed files with 1 additions and 13 deletions Side-by-side Diff
configs/mx7ulp_evk_defconfig
| ... | ... | @@ -3,7 +3,6 @@ |
| 3 | 3 | CONFIG_SYS_TEXT_BASE=0x67800000 |
| 4 | 4 | CONFIG_TARGET_MX7ULP_EVK=y |
| 5 | 5 | CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" |
| 6 | -CONFIG_KERNEL_USE_STD_DTB="imx7ulp-evk" | |
| 7 | 6 | CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" |
| 8 | 7 | CONFIG_BOARD_EARLY_INIT_F=y |
| 9 | 8 | CONFIG_HUSH_PARSER=y |
dts/Kconfig
| ... | ... | @@ -29,10 +29,6 @@ |
| 29 | 29 | This feature provides for run-time configuration of U-Boot |
| 30 | 30 | via a flattened device tree. |
| 31 | 31 | |
| 32 | -config KERNEL_USE_STD_DTB | |
| 33 | - string "Specify the dtb file name for Linux kernel" | |
| 34 | - default DEFAULT_DEVICE_TREE | |
| 35 | - | |
| 36 | 32 | config OF_BOARD_FIXUP |
| 37 | 33 | bool "Board-specific manipulation of Device Tree" |
| 38 | 34 | help |
include/configs/mx7ulp_evk.h
| ... | ... | @@ -90,13 +90,6 @@ |
| 90 | 90 | #define CONFIG_CMD_MEMTEST |
| 91 | 91 | #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) |
| 92 | 92 | |
| 93 | - | |
| 94 | -#ifdef CONFIG_KERNEL_USE_STD_DTB | |
| 95 | -#define LD_FDT_FILE CONFIG_KERNEL_USE_STD_DTB | |
| 96 | -#else | |
| 97 | -#define LD_FDT_FILE CONFIG_DEFAULT_DEVICE_TREE | |
| 98 | -#endif | |
| 99 | - | |
| 100 | 93 | #define CONFIG_MFG_ENV_SETTINGS \ |
| 101 | 94 | CONFIG_MFG_ENV_SETTINGS_DEFAULT \ |
| 102 | 95 | "initrd_addr=0x63800000\0" \ |
| ... | ... | @@ -112,7 +105,7 @@ |
| 112 | 105 | "console=ttyLP0\0" \ |
| 113 | 106 | "fdt_high=0xffffffff\0" \ |
| 114 | 107 | "initrd_high=0xffffffff\0" \ |
| 115 | - "fdt_file=" LD_FDT_FILE ".dtb.dtb\0" \" \ | |
| 108 | + "fdt_file=imx7ulp-evk.dtb.dtb\0" \" \ | |
| 116 | 109 | "fdt_addr=0x63000000\0" \ |
| 117 | 110 | "tee_addr=0x64000000\0" \ |
| 118 | 111 | "tee_file=uTee-7ulp\0" \ |