Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-19 03:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

engicam: Set fdt_file env during run-time

Browse source 
Set fdt_file env variable during board_late_init

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2017-05-07 02:43:04 +05:30 committed by Stefano Babic
parent 68cb6db0f9
commit 77a8c91812
19 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/engicam/geam6ul/geam6ul.c
View file

@ -141,6 +141,9 @@ int board_late_init(void)
break; break;
} }
if (is_mx6ul())
setenv("fdt_file", "imx6ul-geam-kit.dtb");
return 0; return 0;
} }

5
board/engicam/icorem6/icorem6.c
View file

@ -243,6 +243,11 @@ int board_late_init(void)
break; break;
} }
if (is_mx6dq())
setenv("fdt_file", "imx6q-icore.dtb");
else if(is_mx6dl() || is_mx6solo())
setenv("fdt_file", "imx6dl-icore.dtb");
return 0; return 0;
} }

5
board/engicam/icorem6_rqs/icorem6_rqs.c
View file

@ -88,6 +88,11 @@ int board_late_init(void)
break; break;
} }
if (is_mx6dq())
setenv("fdt_file", "imx6q-icore-rqs.dtb");
else if(is_mx6dl() || is_mx6solo())
setenv("fdt_file", "imx6dl-icore-rqs.dtb");
return 0; return 0;
} }

8
board/engicam/isiotmx6ul/isiotmx6ul.c
View file

@ -149,6 +149,14 @@ int board_late_init(void)
break; break;
} }
if (is_mx6ul()) {
#ifdef CONFIG_ENV_IS_IN_MMC
setenv("fdt_file", "imx6ul-isiot-emmc.dtb");
#else
setenv("fdt_file", "imx6ul-isiot-nand.dtb");
#endif
}
return 0; return 0;
} }

1
configs/imx6dl_icore_mmc_defconfig
View file

@ -15,7 +15,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6dl_icore_nand_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6dl_icore_rqs_mmc_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6dl-icore-rqs.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6q_icore_mmc_defconfig
View file

@ -15,7 +15,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6q-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6q_icore_nand_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6q-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6q_icore_rqs_mmc_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6q-icore-rqs.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6ul_geam_mmc_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6ul_geam_nand_defconfig
View file

@ -13,7 +13,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6ul_isiot_emmc_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6ul-isiot-emmc.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6ul_isiot_mmc_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6ul-isiot-emmc.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/imx6ul_isiot_nand_defconfig
View file

@ -13,7 +13,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_DEFAULT_FDT_FILE="imx6ul-isiot-nand.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
include/configs/imx6qdl_icore.h
View file

@ -42,7 +42,6 @@
"fit_image=fit.itb\0" \ "fit_image=fit.itb\0" \
"console=ttymxc3\0" \ "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \

1
include/configs/imx6qdl_icore_rqs.h
View file

@ -37,7 +37,6 @@
"fit_image=fit.itb\0" \ "fit_image=fit.itb\0" \
"console=ttymxc3\0" \ "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \

1
include/configs/imx6ul_geam.h
View file

@ -41,7 +41,6 @@
"fit_image=fit.itb\0" \ "fit_image=fit.itb\0" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x87800000\0" \ "fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \

1
include/configs/imx6ul_isiot.h
View file

@ -42,7 +42,6 @@
"splashpos=m,m\0" \ "splashpos=m,m\0" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x87800000\0" \ "fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \