LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "MLK-19767: imx7ulp: configs: add a new macro for kernel dtb" 

This reverts commit 26766be892.
This commit is contained in:
Shenwei Wang 2018-10-01 08:39:12 -05:00
parent e9f87deae7
commit 6bb52962ea
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/mx7ulp_evk_defconfig
View File

@ -3,7 +3,6 @@ CONFIG_ARCH_MX7ULP=y
CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_SYS_TEXT_BASE=0x67800000
CONFIG_TARGET_MX7ULP_EVK=y CONFIG_TARGET_MX7ULP_EVK=y
CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" 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_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

4
dts/Kconfig
View File

@ -29,10 +29,6 @@ config OF_CONTROL
This feature provides for run-time configuration of U-Boot This feature provides for run-time configuration of U-Boot
via a flattened device tree. 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 config OF_BOARD_FIXUP
bool "Board-specific manipulation of Device Tree" bool "Board-specific manipulation of Device Tree"
help help

9
include/configs/mx7ulp_evk.h
View File

@ -90,13 +90,6 @@
#define CONFIG_CMD_MEMTEST #define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) #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 \ #define CONFIG_MFG_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS_DEFAULT \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \
"initrd_addr=0x63800000\0" \ "initrd_addr=0x63800000\0" \
@ -112,7 +105,7 @@
"console=ttyLP0\0" \ "console=ttyLP0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_file=" LD_FDT_FILE ".dtb\0" \ "fdt_file=imx7ulp-evk.dtb\0" \
"fdt_addr=0x63000000\0" \ "fdt_addr=0x63000000\0" \
"tee_addr=0x64000000\0" \ "tee_addr=0x64000000\0" \
"tee_file=uTee-7ulp\0" \ "tee_file=uTee-7ulp\0" \