[PATCH 0/4] Updates for Toradex boards
This patchset includes fixes and improvements for Toradex boards.
Igor Opaniuk (1): colibri_imx6: adjust boot order
Oleksandr Suvorov (2): apalis/colibri_imx6: remove video= settings board: toradex: apalis-imx8x: fix build instructions
Philippe Schenker (1): colibri_imx6ull/imx7: add missing tdxargs variable
doc/board/toradex/apalix-imx8x.rst | 33 ++++++++++++++++-------------- include/configs/apalis_imx6.h | 5 +---- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx6.h | 4 +--- include/configs/colibri_imx7.h | 2 +- 5 files changed, 22 insertions(+), 24 deletions(-)
From: Igor Opaniuk igor.opaniuk@toradex.com
Remove duplicate of mmc0, set this boot order: 1) SD 2) eMMC 3) USB 4) DHCP boot
Fixes: 0e15165bc4e0 ("colibri_imx6: boot env configuration updates") Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com ---
include/configs/colibri_imx6.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c014d6b2d5..5f5e201b4c 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -72,7 +72,6 @@
#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \
From: Philippe Schenker philippe.schenker@toradex.com
All the other boards have tdxargs specified for setting manual kernel command-line arguments. Add them also to NAND-based boards.
Signed-off-by: Philippe Schenker philippe.schenker@toradex.com Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com ---
include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx7.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 2827c171c9..22ee2ba03e 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -63,7 +63,7 @@ "ubi.fm_autoconvert=1\0" \ "ubiboot=run setup; " \ "setenv bootargs ${defargs} ${ubiargs} " \ - "${setupargs} ${vidargs}; echo Booting from NAND...; " \ + "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \ "ubi part ubi &&" \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 85dd891055..2fffaa39c0 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -110,7 +110,7 @@ "ubi.fm_autoconvert=1\0" \ "ubiboot=run setup; " \ "setenv bootargs ${defargs} ${ubiargs} " \ - "${setupargs} ${vidargs}; echo Booting from NAND...; " \ + "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \ "ubi part ubi && run m4boot && " \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \
Since Toradex provides the full set of overlays for Linux kernel for display interfaces for both Apalis iMX6Q and Colibri iMX6DL modules, the video= settings are obsolete. Remove them.
Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com ---
include/configs/apalis_imx6.h | 5 +---- include/configs/colibri_imx6.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 0e81ef94d3..12de0105c6 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -163,10 +163,7 @@ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ - "vidargs=mxc_hdmi.only_cea=1 " \ - "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ - "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ - "fbmem=32M\0 " + "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
/* Miscellaneous configurable options */ #undef CONFIG_SYS_CBSIZE diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 5f5e201b4c..804a144a03 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -143,8 +143,7 @@ "source ${loadaddr}\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ - "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \ - "video=mxcfb1:off fbmem=8M\0 " + "vidargs=fbmem=8M\0"
/* Miscellaneous configurable options */ #undef CONFIG_SYS_CBSIZE
Fix an URL for downloading the SCFW binary for an Apalis iMX8X and improve u-boot image build instructions.
Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com ---
doc/board/toradex/apalix-imx8x.rst | 33 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/doc/board/toradex/apalix-imx8x.rst b/doc/board/toradex/apalix-imx8x.rst index ce7dde8d00..efa7e0c72e 100644 --- a/doc/board/toradex/apalix-imx8x.rst +++ b/doc/board/toradex/apalix-imx8x.rst @@ -1,43 +1,46 @@ .. SPDX-License-Identifier: GPL-2.0+
-Apalis iMX8X V1.1A Module +Apalis iMX8X V1.1A Module (SoC NXP i.MX8QXP RevB) ==========================
Quick Start -----------
-- Build the ARM trusted firmware binary -- Get scfw_tcm.bin and ahab-container.img +- Get and Build the ARM trusted firmware +- Get System Controller firmware +- Get SECO container - Build U-Boot - Load U-Boot binary using uuu - Flash U-Boot binary into the eMMC - Boot
+Note: builddir is U-Boot build directory (source directory for in-tree builds) + Get and Build the ARM Trusted Firmware --------------------------------------
.. code-block:: bash
- $ git clone -b toradex_imx_5.4.24_2.1.0 http://git.toradex.com/cgit/imx-atf.git - $ cd imx-atf/ - $ make PLAT=imx8qx bl31 + $ cd $(builddir) + $ git clone -b toradex_imx_5.4.70_2.3.0 http://git.toradex.com/cgit/imx-atf.git + $ make PLAT=imx8qx bl31 -C imx-atf + $ cp imx-atf/build/imx8qx/release/bl31.bin $(builddir)
-Get scfw_tcm.bin and ahab-container.img +Get System Controller firmware ---------------------------------------
.. code-block:: bash
- $ wget https://github.com/toradex/i.MX-System-Controller-Firmware/blob/master/src/s... - $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-seco-3.6.3.bin - $ chmod +x imx-seco-3.6.3.bin - $ ./imx-seco-3.6.3.bin + $ wget https://github.com/toradex/i.MX-System-Controller-Firmware/raw/master/src/sc...
-Copy the following binaries to the U-Boot folder: +Get SECO container +---------------------------------------
.. code-block:: bash
- $ cp imx-atf/build/imx8qx/release/bl31.bin . - $ cp imx-seco-3.6.3/firmware/seco/mx8qxb0-ahab-container.img mx8qx-ahab-container.imx8_defconfig + $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-seco-3.7.4.bin + $ sh imx-seco-3.7.4.bin + $ cp imx-seco-3.7.4/firmware/seco/mx8qxb0-ahab-container.img $(builddir)/mx8qx-ahab-container.img
Build U-Boot ------------ @@ -58,7 +61,7 @@ to your host and execute uuu:
.. code-block:: bash
- sudo ./uuu u-boot/u-boot-dtb.imx + sudo ./uuu $(builddir)/u-boot-dtb.imx
Flash the U-Boot Binary into the eMMC -------------------------------------
Fix an URL for downloading the SCFW binary for an Apalis iMX8X and improve u-boot image build instructions. Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
Since Toradex provides the full set of overlays for Linux kernel for display interfaces for both Apalis iMX6Q and Colibri iMX6DL modules, the video= settings are obsolete. Remove them. Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
From: Philippe Schenker philippe.schenker@toradex.com All the other boards have tdxargs specified for setting manual kernel command-line arguments. Add them also to NAND-based boards. Signed-off-by: Philippe Schenker philippe.schenker@toradex.com Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
From: Igor Opaniuk igor.opaniuk@toradex.com Remove duplicate of mmc0, set this boot order:
- SD
- eMMC
- USB
- DHCP boot
Fixes: 0e15165bc4e0 ("colibri_imx6: boot env configuration updates") Signed-off-by: Igor Opaniuk igor.opaniuk@toradex.com Signed-off-by: Oleksandr Suvorov oleksandr.suvorov@toradex.com
Applied to u-boot-imx, master, thanks !
Best regards, Stefano Babic
participants (2)
-
Oleksandr Suvorov -
sbabic＠denx.de