diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-11-16 21:00:10 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-11-27 11:22:44 +0100 |
| commit | abec6c569746cd382889a71945d2684d00e2112d (patch) | |
| tree | 6a87d3d5c52e4c4086ce1afdc6de8b3dbf2dfc51 | |
| parent | 5e54aedd1c5f04ed3efe45c50ea79c3350a86bfc (diff) | |
colibri_imx6ull: add dtb for wifi variant
Add handling for the device tree for the Colibri iMX6ULL 512MB Wi-Fi / BT
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | board/toradex/colibri-imx6ull/colibri_imx6ull.c | 5 | ||||
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/board/toradex/colibri-imx6ull/colibri_imx6ull.c b/board/toradex/colibri-imx6ull/colibri_imx6ull.c index 8fcd2a8265..4a48f01427 100644 --- a/board/toradex/colibri-imx6ull/colibri_imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri_imx6ull.c @@ -21,6 +21,7 @@ #include <dm/platform_data/serial_mxc.h> #include <fdt_support.h> #include <fsl_esdhc.h> +#include <imx_thermal.h> #include <jffs2/load_kernel.h> #include <linux/sizes.h> #include <mmc.h> @@ -352,6 +353,10 @@ static const struct boot_mode board_boot_modes[] = { int board_late_init(void) { + int minc, maxc; + if (get_cpu_temp_grade(&minc, &maxc) != TEMP_COMMERCIAL) + setenv("variant", "-wifi"); + #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); #endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 1e5bae3e9e..8aa9df2ad0 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -64,6 +64,8 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 +#define FDT_FILE "imx6ull-colibri${variant}-${fdt_board}.dtb" + #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ @@ -80,7 +82,7 @@ "setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting from NFS...;" \ "dhcp ${kernel_addr_r} && " \ - "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ + "tftp ${fdt_addr_r} " FDT_FILE " && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define SD_BOOTCMD \ @@ -88,7 +90,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} ${soc}-colibri-${fdt_board}.dtb && " \ + "load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define UBI_BOOTCMD \ @@ -103,7 +105,7 @@ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define CONFIG_BOOTCOMMAND "run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" + "setenv fdtfile " FDT_FILE " && run distro_bootcmd;" #define BOOTENV_RUN_NET_USB_START "" #define BOOT_TARGET_DEVICES(func) \ |