diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-06-03 18:42:01 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-22 14:36:40 +0200 |
| commit | e7a937b9477bc4a513821cd792c9c9d35d049cef (patch) | |
| tree | c83a981bc5e10f297ac1d7af0292b4e6fcaa9606 | |
| parent | 651ceaea01475e87b7264ab3844ce746725cb538 (diff) | |
colibri_imx7: make use of soc environment variable for dt file
Use the exact SoC information from the soc environment variable to
load the device tree file for the Colibri iMX7S or iMX7D.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | include/configs/colibri_imx7.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 0f85afa17a..6bb3e36ad7 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -23,6 +23,7 @@ #define CONFIG_COLIBRI_IMX7 #define CONFIG_ROM_UNIFIED_SECTIONS #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_ARCH_MISC_INIT #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO_LATE @@ -195,7 +196,7 @@ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \ - "load mmc 0:1 ${fdt_addr_r} ${fdt_file} && " \ + "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define NFS_BOOTCMD \ @@ -204,7 +205,7 @@ "setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting from NFS...;" \ "dhcp ${kernel_addr_r} && " \ - "tftp ${fdt_addr_r} ${fdt_file} && " \ + "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define UBI_BOOTCMD \ @@ -215,7 +216,7 @@ "${setupargs} ${vidargs}; echo Booting from NAND...; " \ "ubi part ubi && ubifsmount ubi0:rootfs && " \ "ubifsload ${kernel_addr_r} /boot/${kernel_file} && " \ - "ubifsload ${fdt_addr_r} /boot/${fdt_file} && " \ + "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && "\ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" @@ -251,7 +252,7 @@ "defargs=\0" \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ - "fdt_file=imx7d-colibri.dtb\0" \ + "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ "fdt_high=0xffffffff\0" \ "image=zImage\0" \ |