Eric Lee / smarc-uboot

14
Download as
Browse Code ยป

Commit 3fba1c1a76cadfe0177e61a85eac3da10ee086e0

Authored by Shenwei Wang
1 parent 6bb52962ea
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-19767-1: imx7ulp: configs: Enable DEFAULT_FDT_FILE 

Specify the default dtb file for kernel boot per i.MX7ULP
board config.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Reviewed-by: Frank Li <Frank.li@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Showing 4 changed files with 4 additions and 1 deletions Side-by-side Diff

configs/mx7ulp_evk_defconfig
Diff comments   View file @ 3fba1c1
... ... @@ -3,6 +3,7 @@
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_DEFAULT_FDT_FILE="imx7ulp-evk"
6 7 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
7 8 CONFIG_BOARD_EARLY_INIT_F=y
8 9 CONFIG_HUSH_PARSER=y
configs/mx7ulp_evk_emmc_defconfig
Diff comments   View file @ 3fba1c1
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SYS_TEXT_BASE=0x67800000
4 4 CONFIG_TARGET_MX7ULP_EVK=y
5 5 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc"
  6 +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk-emmc"
6 7 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
7 8 CONFIG_BOARD_EARLY_INIT_F=y
8 9 CONFIG_HUSH_PARSER=y
configs/mx7ulp_evk_m4boot_defconfig
Diff comments   View file @ 3fba1c1
... ... @@ -3,6 +3,7 @@
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_DEFAULT_FDT_FILE="imx7ulp-evk"
6 7 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
7 8 CONFIG_BOARD_EARLY_INIT_F=y
8 9 CONFIG_HUSH_PARSER=y
include/configs/mx7ulp_evk.h
Diff comments   View file @ 3fba1c1
... ... @@ -105,7 +105,7 @@
105 105 "console=ttyLP0\0" \
106 106 "fdt_high=0xffffffff\0" \
107 107 "initrd_high=0xffffffff\0" \
108   - "fdt_file=imx7ulp-evk.dtb.dtb\0" \" \
  108 + "fdt_file=" CONFIG_DEFAULT_FDT_FILE ".dtb.dtb\0" \" \
109 109 "fdt_addr=0x63000000\0" \
110 110 "tee_addr=0x64000000\0" \
111 111 "tee_file=uTee-7ulp\0" \