Skip to contentSkip to conversation

toradex: add support for Apalis iMX8X WB IT V1.1 module

PATCH New Igor Opaniuk 4 participants 21 messages Oct 22, 2020 – Dec 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover toradex: add support for Apalis iMX8X WB IT V1.1 module

- Adds initial support for the Toradex Apalis iMX8X 2GB WB IT V1.1A System on Module suppo
- Introduces weak function board_mem_get_layout() for imx8-based board which allows overriding the memory layout from board code in runtime, useful for handling different SKU versions

Igor Opaniuk (6):
ARM: dts: fsl-imx8qxp-apalis: add initial device tree
board: toradex: add apalis-imx8x 2gb wb it v1.1a module support
doc: board: apalis-imx8x: add documentation
apalis-imx8: add implementation for board_mem_get_layout
apalis-imx8x: add implementation for board_mem_get_layout
colibri-imx8x: add implementation for board_mem_get_layout

Marcel Ziswiler (1):
imx8: allow overriding memory layout

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi   | 139 +++++++++
 arch/arm/dts/fsl-imx8qxp-apalis.dts           | 278 ++++++++++++++++++
 arch/arm/include/asm/mach-imx/sys_proto.h     |   5 +
 arch/arm/mach-imx/imx8/Kconfig                |   6 +
 arch/arm/mach-imx/imx8/cpu.c                  |  96 ++++--
 board/toradex/apalis-imx8/apalis-imx8.c       |  23 ++
 board/toradex/apalis-imx8x/Kconfig            |  30 ++
 board/toradex/apalis-imx8x/MAINTAINERS        |  10 +
 board/toradex/apalis-imx8x/Makefile           |   6 +
 .../apalis-imx8x/apalis-imx8x-imximage.cfg    |  24 ++
 board/toradex/apalis-imx8x/apalis-imx8x.c     | 154 ++++++++++
 board/toradex/colibri-imx8x/colibri-imx8x.c   |  23 ++
 configs/apalis-imx8x_defconfig                |  77 +++++
 doc/board/toradex/apalix-imx8x.rst            |  74 +++++
 doc/board/toradex/index.rst                   |   1 +
 include/configs/apalis-imx8x.h                | 149 ++++++++++
 17 files changed, 1067 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts
 create mode 100644 board/toradex/apalis-imx8x/Kconfig
 create mode 100644 board/toradex/apalis-imx8x/MAINTAINERS
 create mode 100644 board/toradex/apalis-imx8x/Makefile
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c
 create mode 100644 configs/apalis-imx8x_defconfig
 create mode 100644 doc/board/toradex/apalix-imx8x.rst
 create mode 100644 include/configs/apalis-imx8x.h
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/7 ARM: dts: fsl-imx8qxp-apalis: add initial device tree

From: Igor Opaniuk <[email protected]>

Introduce initial hierarchy of device trees for Apalis iMX8X System on Module.

---

 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi | 139 ++++++++++
 arch/arm/dts/fsl-imx8qxp-apalis.dts         | 278 ++++++++++++++++++++
 3 files changed, 418 insertions(+)
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts
arch/arm/dts/Makefile +1 -0
index b195723f16..58a5c2baf9 100644
@@ -757,6 +757,7 @@ dtb-$(CONFIG_ARCH_IMX8) += \
 	imx8qm-rom7720-a1.dtb \
 	fsl-imx8qxp-ai_ml.dtb \
 	fsl-imx8qxp-colibri.dtb \
+	fsl-imx8qxp-apalis.dtb \
 	fsl-imx8qxp-mek.dtb \
 	imx8-deneb.dtb \
 	imx8-giedi.dtb
arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi new file +139 -0

139 lines not on this page · raw message

arch/arm/dts/fsl-imx8qxp-apalis.dts new file +278 -0

278 lines not on this page · raw message

Signature · 1 line
2.17.1
#4 lore raw

PATCH 2/7 board: toradex: add apalis-imx8x 2gb wb it v1.1a module support

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

This commit adds initial support for the Toradex Apalis iMX8X 2GB WB IT V1.1A System on Module support [1].

Boot log:
U-Boot 2020.10-02940-g894aebb7e8-dirty (Oct 22 2020 - 09:43:57 +0300)

CPU:   NXP i.MX8QXP RevB A35 at 1200 MHz at 30C
DRAM:  2 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... OK
In:    serial at 5a070000
Out:   serial at 5a070000
Err:   serial at 5a070000
Model: Toradex Apalis iMX8 QuadXPlus 2GB Wi-Fi / BT IT V1.1A,
Serial# 06617018
Net:   eth0: ethernet at 5b040000 [PRIME]
Hit any key to stop autoboot:  0

Functionality wise the following is known to be working:
- eMMC and MMC/SD card
- Ethernet (*)
- GPIOs
- I2C

Unfortunately, there is no USB functionality for the i.MX 8QXP as of yet.

* With the SCU FW from the latest Toradex BSP 5.0.0 (SCU FW 1.5.1) ETH PHY encounters bring up problems after reset, this will be fixed soon on SCU FW side.

[1] https://www.toradex.com/computer-on-modules/apalis-arm-family/nxp-imx-8x

---

 arch/arm/mach-imx/imx8/Kconfig                |   6 +
 board/toradex/apalis-imx8x/Kconfig            |  30 ++++
 board/toradex/apalis-imx8x/MAINTAINERS        |  10 ++
 board/toradex/apalis-imx8x/Makefile           |   6 +
 .../apalis-imx8x/apalis-imx8x-imximage.cfg    |  24 +++
 board/toradex/apalis-imx8x/apalis-imx8x.c     | 131 +++++++++++++++
 configs/apalis-imx8x_defconfig                |  77 +++++++++
 include/configs/apalis-imx8x.h                | 149 ++++++++++++++++++
 8 files changed, 433 insertions(+)
 create mode 100644 board/toradex/apalis-imx8x/Kconfig
 create mode 100644 board/toradex/apalis-imx8x/MAINTAINERS
 create mode 100644 board/toradex/apalis-imx8x/Makefile
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c
 create mode 100644 configs/apalis-imx8x_defconfig
 create mode 100644 include/configs/apalis-imx8x.h
arch/arm/mach-imx/imx8/Kconfig +6 -0
index 9d1f73dfc7..04b9729109 100644
@@ -65,6 +65,11 @@ config TARGET_COLIBRI_IMX8X
 	select BOARD_LATE_INIT
 	select IMX8QXP
 
+config TARGET_APALIS_IMX8X
+	bool "Support Apalis iMX8X module"
+	select BOARD_LATE_INIT
+	select IMX8QXP
+
 config TARGET_DENEB
 	bool "Support i.MX8QXP Capricorn Deneb board"
 	select BOARD_LATE_INIT
@@ -98,6 +103,7 @@ source "board/freescale/imx8qxp_mek/Kconfig"
 source "board/advantech/imx8qm_rom7720_a1/Kconfig"
 source "board/toradex/apalis-imx8/Kconfig"
 source "board/toradex/colibri-imx8x/Kconfig"
+source "board/toradex/apalis-imx8x/Kconfig"
 source "board/siemens/capricorn/Kconfig"
 
 config IMX_SNVS_SEC_SC
board/toradex/apalis-imx8x/Kconfig new file +30 -0
new file mode 100644
index 0000000000..ee61e09736
@@ -0,0 +1,30 @@
+if TARGET_APALIS_IMX8X
+
+config SYS_BOARD
+	default "apalis-imx8x"
+
+config SYS_VENDOR
+	default "toradex"
+
+config SYS_CONFIG_NAME
+	default "apalis-imx8x"
+
+config TDX_CFG_BLOCK
+	default y
+
+config TDX_HAVE_MMC
+	default y
+
+config TDX_CFG_BLOCK_DEV
+	default "0"
+
+config TDX_CFG_BLOCK_PART
+	default "1"
+
+# Toradex config block in eMMC, at the end of 1st "boot sector"
+config TDX_CFG_BLOCK_OFFSET
+	default "-512"
+
+source "board/toradex/common/Kconfig"
+
+endif
board/toradex/apalis-imx8x/MAINTAINERS new file +10 -0
new file mode 100644
index 0000000000..fbf9379931
@@ -0,0 +1,10 @@
+Apalis iMX8X
+M:	Igor Opaniuk <[email protected]>
+W:	http://developer.toradex.com/software/linux/linux-software
+S:	Maintained
+F:	arch/arm/dts/fsl-imx8x-apalis.dts
+F:	arch/arm/dts/fsl-imx8x-apalis-u-boot.dtsi
+F:	board/toradex/apalis-imx8x/
+F:	configs/apalis-imx8x_defconfig
+F:	doc/board/toradex/apalis-imx8x.rst
+F:	include/configs/apalis-imx8x.h
board/toradex/apalis-imx8x/Makefile new file +6 -0
new file mode 100644
index 0000000000..9d6e85b742
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright 2020 Toradex
+#
+
+obj-y += apalis-imx8x.o
board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg new file +24 -0
new file mode 100644
index 0000000000..58c62d0a65
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020 Toradex
+ *
+ * Refer doc/imx/mkimage/imx8image.txt for more details about how-to configure
+ * and create imx8image boot image
+ */
+
+#define __ASSEMBLY__
+
+/* Boot from SD, sector size 0x400 */
+BOOT_FROM EMMC_FASTBOOT 0x400
+/* SoC type IMX8QX */
+SOC_TYPE IMX8QX
+/* Append seco container image */
+APPEND mx8qx-ahab-container.img
+/* Create the 2nd container */
+CONTAINER
+/* Add scfw image with exec attribute */
+IMAGE SCU mx8qx-apalis-scfw-tcm.bin
+/* Add ATF image with exec attribute */
+IMAGE A35 bl31.bin 0x80000000
+/* Add U-Boot image with load attribute */
+DATA A35 u-boot-dtb.bin 0x80020000
board/toradex/apalis-imx8x/apalis-imx8x.c new file +131 -0

131 lines not on this page · raw message

configs/apalis-imx8x_defconfig new file +77 -0

77 lines not on this page · raw message

include/configs/apalis-imx8x.h new file +149 -0

149 lines not on this page · raw message

Signature · 1 line
2.17.1
#8 lore raw

PATCH 3/7 doc: board: apalis-imx8x: add documentation

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

This documents the u-boot build and deployment procedure.

---

 doc/board/toradex/apalix-imx8x.rst | 74 ++++++++++++++++++++++++++++++
 doc/board/toradex/index.rst        |  1 +
 2 files changed, 75 insertions(+)
 create mode 100644 doc/board/toradex/apalix-imx8x.rst
doc/board/toradex/apalix-imx8x.rst new file +74 -0
new file mode 100644
index 0000000000..ce7dde8d00
@@ -0,0 +1,74 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Apalis iMX8X V1.1A Module
+==========================
+
+Quick Start
+-----------
+
+- Build the ARM trusted firmware binary
+- Get scfw_tcm.bin and ahab-container.img
+- Build U-Boot
+- Load U-Boot binary using uuu
+- Flash U-Boot binary into the eMMC
+- Boot
+
+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
+
+Get scfw_tcm.bin and ahab-container.img
+---------------------------------------
+
+.. code-block:: bash
+
+    $ wget https://github.com/toradex/i.MX-System-Controller-Firmware/blob/master/src/scfw_export_mx8qx_b0/build_mx8qx_b0/mx8qx-apalis-scfw-tcm.bin
+    $ 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
+
+Copy the following binaries to the U-Boot folder:
+
+.. 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
+
+Build U-Boot
+------------
+.. code-block:: bash
+
+    $ make apalis-imx8x_defconfig
+    $ make u-boot-dtb.imx
+
+Load the U-Boot Binary Using UUU
+--------------------------------
+
+Get the latest version of the universal update utility (uuu) aka ``mfgtools 3.0``:
+
+https://community.nxp.com/external-link.jspa?url=https%3A%2F%2Fgithub.com%2FNXPmicro%2Fmfgtools%2Freleases
+
+Put the module into USB recovery aka serial downloader mode, connect USB device
+to your host and execute uuu:
+
+.. code-block:: bash
+
+    sudo ./uuu u-boot/u-boot-dtb.imx
+
+Flash the U-Boot Binary into the eMMC
+-------------------------------------
+
+Burn the ``u-boot-dtb.imx`` binary to the primary eMMC hardware boot area
+partition and boot:
+
+.. code-block:: bash
+
+    load mmc 1:1 $loadaddr u-boot-dtb.imx
+    setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200
+    mmc dev 0 1
+    mmc write ${loadaddr} 0x0 ${blkcnt}
doc/board/toradex/index.rst +1 -0
index 16b5a0770d..abba648f86 100644
@@ -7,6 +7,7 @@ Toradex
    :maxdepth: 2
 
    apalix-imx8
+   apalix-imx8x
    colibri_imx7
    colibri-imx8x
    verdin-imx8mm
Signature · 1 line
2.17.1
#11 lore raw

PATCH 4/7 imx8: allow overriding memory layout

In reply to Igor Opaniuk

From: Marcel Ziswiler <[email protected]>

Introduce weak function board_mem_get_layout() which allows overriding the memory layout from board code in runtime, useful for handling different SKU versions.

---

 arch/arm/include/asm/mach-imx/sys_proto.h |  5 ++
 arch/arm/mach-imx/imx8/cpu.c              | 96 ++++++++++++++++-------
 2 files changed, 72 insertions(+), 29 deletions(-)
arch/arm/include/asm/mach-imx/sys_proto.h +5 -0
index 5f0c1ae218..43eae6d796 100644
@@ -183,6 +183,11 @@ void init_src(void);
 void init_snvs(void);
 void imx_wdog_disable_powerdown(void);
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+			  u64 *phys_sdram_1_size,
+			  u64 *phys_sdram_2_start,
+			  u64 *phys_sdram_2_size);
+
 int arch_auxiliary_core_check_up(u32 core_id);
 
 int board_mmc_get_env_dev(int devno);
arch/arm/mach-imx/imx8/cpu.c +67 -29

190 lines not on this page · raw message

Signature · 1 line
2.17.1
#14 lore raw

PATCH 5/7 apalis-imx8: add implementation for board_mem_get_layout

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add implementation of board_mem_get_layout for overriding the memory layout.

---

 board/toradex/apalis-imx8/apalis-imx8.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
board/toradex/apalis-imx8/apalis-imx8.c +23 -0
index 9263b0f51f..2ed66261d2 100644
@@ -37,6 +37,29 @@ static void setup_iomux_uart(void)
 	imx8_iomux_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
 }
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+			  u64 *phys_sdram_1_size,
+			  u64 *phys_sdram_2_start,
+			  u64 *phys_sdram_2_size)
+{
+	u32 is_quadplus = 0, val = 0;
+	sc_err_t scierr = sc_misc_otp_fuse_read(-1, 6, &val);
+
+	if (scierr == SC_ERR_NONE) {
+		/* QP has one A72 core disabled */
+		is_quadplus = ((val >> 4) & 0x3) != 0x0;
+	}
+
+	*phys_sdram_1_start = PHYS_SDRAM_1;
+	*phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
+	*phys_sdram_2_start = PHYS_SDRAM_2;
+	if (is_quadplus)
+		/* Our QP based SKUs only have 2 GB RAM (PHYS_SDRAM_1_SIZE) */
+		*phys_sdram_2_size = 0x0UL;
+	else
+		*phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
+}
+
 int board_early_init_f(void)
 {
 	sc_pm_clock_rate_t rate = SC_80MHZ;
Signature · 1 line
2.17.1
#17 lore raw

PATCH 6/7 apalis-imx8x: add implementation for board_mem_get_layout

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add implementation of board_mem_get_layout for overriding the memory layout.

---

 board/toradex/apalis-imx8x/apalis-imx8x.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
board/toradex/apalis-imx8x/apalis-imx8x.c +23 -0
index 9f00f26cfe..739d2e5155 100644
@@ -37,6 +37,29 @@ static void setup_iomux_uart(void)
 	imx8_iomux_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
 }
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+			  u64 *phys_sdram_1_size,
+			  u64 *phys_sdram_2_start,
+			  u64 *phys_sdram_2_size)
+{
+	u32 is_dualx = 0, val = 0;
+	sc_err_t scierr = sc_misc_otp_fuse_read(-1, 6, &val);
+
+	if (scierr == SC_ERR_NONE) {
+		/* DX has two A35 cores disabled */
+		is_dualx = (val & 0xf) != 0x0;
+	}
+
+	*phys_sdram_1_start = PHYS_SDRAM_1;
+	if (is_dualx)
+		/* Our DX based SKUs only have 1 GB RAM */
+		*phys_sdram_1_size = SZ_1G;
+	else
+		*phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
+	*phys_sdram_2_start = PHYS_SDRAM_2;
+	*phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
+}
+
 int board_early_init_f(void)
 {
 	sc_pm_clock_rate_t rate;
Signature · 1 line
2.17.1
#19 lore raw

PATCH 7/7 colibri-imx8x: add implementation for board_mem_get_layout

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add implementation of board_mem_get_layout for overriding the memory layout.

---

 board/toradex/colibri-imx8x/colibri-imx8x.c | 23 +++++++++++++++++++++
 1 file changed, 23 insertions(+)
board/toradex/colibri-imx8x/colibri-imx8x.c +23 -0
index f981c11a37..da081e30be 100644
@@ -39,6 +39,29 @@ static void setup_iomux_uart(void)
 	imx8_iomux_setup_multiple_pads(uart3_pads, ARRAY_SIZE(uart3_pads));
 }
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+			  u64 *phys_sdram_1_size,
+			  u64 *phys_sdram_2_start,
+			  u64 *phys_sdram_2_size)
+{
+	u32 is_dualx = 0, val = 0;
+	sc_err_t scierr = sc_misc_otp_fuse_read(-1, 6, &val);
+
+	if (scierr == SC_ERR_NONE) {
+		/* DX has two A35 cores disabled */
+		is_dualx = (val & 0xf) != 0x0;
+	}
+
+	*phys_sdram_1_start = PHYS_SDRAM_1;
+	if (is_dualx)
+		/* Our DX based SKUs only have 1 GB RAM */
+		*phys_sdram_1_size = SZ_1G;
+	else
+		*phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
+	*phys_sdram_2_start = PHYS_SDRAM_2;
+	*phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
+}
+
 int board_early_init_f(void)
 {
 	sc_pm_clock_rate_t rate;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/7 ARM: dts: fsl-imx8qxp-apalis: add initial device tree

In reply to Igor Opaniuk
Quoted 7 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Introduce initial hierarchy of device trees for Apalis iMX8X System on Module.

Quoted 453 lines

---

 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi | 139 ++++++++++
 arch/arm/dts/fsl-imx8qxp-apalis.dts         | 278 ++++++++++++++++++++
 3 files changed, 418 insertions(+)
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
 create mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts
arch/arm/dts/Makefile +1 -0
index b195723f16..58a5c2baf9 100644
@@ -757,6 +757,7 @@ dtb-$(CONFIG_ARCH_IMX8) += \
        imx8qm-rom7720-a1.dtb \
        fsl-imx8qxp-ai_ml.dtb \
        fsl-imx8qxp-colibri.dtb \
+       fsl-imx8qxp-apalis.dtb \
        fsl-imx8qxp-mek.dtb \
        imx8-deneb.dtb \
        imx8-giedi.dtb
arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi new file +139 -0
new file mode 100644
index 0000000000..e41911a04a
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2020 Toradex
+ */
+
+&{/imx8qx-pm} {
+
+       u-boot,dm-pre-proper;
+};
+
+&mu {
+       u-boot,dm-pre-proper;
+};
+
+&clk {
+       u-boot,dm-pre-proper;
+};
+
+&iomuxc {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio0 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio1 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio2 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio3 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio4 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio5 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio6 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_lsio_gpio7 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_dma {
+       u-boot,dm-pre-proper;
+};
+
+&pd_dma_lpuart0 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_dma_lpuart3 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_conn {
+       u-boot,dm-pre-proper;
+};
+
+&pd_conn_sdch0 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_conn_sdch1 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_conn_sdch2 {
+       u-boot,dm-pre-proper;
+};
+
+&pd_conn_enet0 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio0 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio1 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio2 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio3 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio4 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio5 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio6 {
+       u-boot,dm-pre-proper;
+};
+
+&gpio7 {
+       u-boot,dm-pre-proper;
+};
+
+&lpuart3 {
+       u-boot,dm-pre-proper;
+};
+
+&lpuart0 {
+       u-boot,dm-pre-proper;
+};
+
+&usdhc1 {
+       u-boot,dm-pre-proper;
+       /delete-property/ assigned-clock-parents;
+};
+
+&usdhc2 {
+       u-boot,dm-pre-proper;
+       /delete-property/ assigned-clock-parents;
+};
arch/arm/dts/fsl-imx8qxp-apalis.dts new file +278 -1
new file mode 100644
index 0000000000..6bd231b283
@@ -0,0 +1,278 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2020 Toradex
+ */
+
+/dts-v1/;
+
+#include "fsl-imx8qxp.dtsi"
+#include "fsl-imx8qxp-apalis-u-boot.dtsi"
+
+/ {
+       model = "Toradex Apalis iMX8X";
+       compatible = "toradex,apalis-imx8x", "fsl,imx8qxp";
+
+       chosen {
+               bootargs = "console=ttyLP1,115200";
+               stdout-path = &lpuart1;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               reg_usb_otg1_vbus: regulator at 0 {
+                       compatible = "regulator-fixed";
+                       reg = <0>;
+                       regulator-name = "usb_otg1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+       };
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_reset_moci>;
+
+       apalis-imx8x {
+               /* Apalis UART1 */
+               pinctrl_lpuart1: lpuart1grp {
+                       fsl,pins = <
+                               SC_P_UART1_RX_ADMA_UART1_RX             0x06000020      /* SODIMM 118 */
+                               SC_P_UART1_TX_ADMA_UART1_TX             0x06000020      /* SODIMM 112 */
+                       >;
+               };
+
+               /* On-module Gigabit Ethernet PHY Micrel KSZ9031 */
+               pinctrl_fec1: fec1grp {
+                       fsl,pins = <
+                               SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB0_PAD      0x14a0
+                               SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB1_PAD      0x14a0
+                               SC_P_ENET0_MDC_CONN_ENET0_MDC                   0x06000020
+                               SC_P_ENET0_MDIO_CONN_ENET0_MDIO                 0x06000020
+                               SC_P_ENET0_RGMII_TX_CTL_CONN_ENET0_RGMII_TX_CTL 0x61
+                               SC_P_ENET0_RGMII_TXC_CONN_ENET0_RGMII_TXC       0x61
+                               SC_P_ENET0_RGMII_TXD0_CONN_ENET0_RGMII_TXD0     0x61
+                               SC_P_ENET0_RGMII_TXD1_CONN_ENET0_RGMII_TXD1     0x61
+                               SC_P_ENET0_RGMII_TXD2_CONN_ENET0_RGMII_TXD2     0x61
+                               SC_P_ENET0_RGMII_TXD3_CONN_ENET0_RGMII_TXD3     0x61
+                               SC_P_ENET0_RGMII_RXC_CONN_ENET0_RGMII_RXC       0x61
+                               SC_P_ENET0_RGMII_RX_CTL_CONN_ENET0_RGMII_RX_CTL 0x61
+                               SC_P_ENET0_RGMII_RXD0_CONN_ENET0_RGMII_RXD0     0x61
+                               SC_P_ENET0_RGMII_RXD1_CONN_ENET0_RGMII_RXD1     0x61
+                               SC_P_ENET0_RGMII_RXD2_CONN_ENET0_RGMII_RXD2     0x61
+                               SC_P_ENET0_RGMII_RXD3_CONN_ENET0_RGMII_RXD3     0x61
+                               /* On-module ETH_RESET# */
+                               SC_P_MIPI_CSI0_MCLK_OUT_LSIO_GPIO3_IO04         0x06000020
+                               /* On-module ETH_INT# */
+                               SC_P_ADC_IN2_LSIO_GPIO1_IO12                    0x21
+                       >;
+               };
+
+               /* Apalis BKL_ON */
+               pinctrl_gpio_bkl_on: gpio-bkl-on {
+                       fsl,pins = <
+                               SC_P_QSPI0A_DQS_LSIO_GPIO3_IO13                 0x40            /* SODIMM 286 */
+                       >;
+               };
+
+               pinctrl_hog0: hog0grp {
+                       fsl,pins = <
+                               SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHB_PAD          0x000514a0
+                       >;
+               };
+
+               pinctrl_hog1: hog1grp {
+                       fsl,pins = <
+                               /* Apalis USBO1_EN */
+                               SC_P_QSPI0A_SCLK_LSIO_GPIO3_IO16                0x41            /* SODIMM 274 */
+                       >;
+               };
+
+               /* Apalis RESET_MOCI# */
+               pinctrl_reset_moci: gpioresetmocigrp {
+                       fsl,pins = <
+                               SC_P_PCIE_CTRL0_CLKREQ_B_LSIO_GPIO4_IO01        0x21
+                       >;
+               };
+
+               /* On-module eMMC */
+               pinctrl_usdhc1: usdhc1grp {
+                       fsl,pins = <
+                               SC_P_EMMC0_CLK_CONN_EMMC0_CLK                   0x06000041
+                               SC_P_EMMC0_CMD_CONN_EMMC0_CMD                   0x21
+                               SC_P_EMMC0_DATA0_CONN_EMMC0_DATA0               0x21
+                               SC_P_EMMC0_DATA1_CONN_EMMC0_DATA1               0x21
+                               SC_P_EMMC0_DATA2_CONN_EMMC0_DATA2               0x21
+                               SC_P_EMMC0_DATA3_CONN_EMMC0_DATA3               0x21
+                               SC_P_EMMC0_DATA4_CONN_EMMC0_DATA4               0x21
+                               SC_P_EMMC0_DATA5_CONN_EMMC0_DATA5               0x21
+                               SC_P_EMMC0_DATA6_CONN_EMMC0_DATA6               0x21
+                               SC_P_EMMC0_DATA7_CONN_EMMC0_DATA7               0x21
+                               SC_P_EMMC0_STROBE_CONN_EMMC0_STROBE             0x41
+                               SC_P_EMMC0_RESET_B_CONN_EMMC0_RESET_B           0x21
+                       >;
+               };
+
+               pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
+                       fsl,pins = <
+                               SC_P_EMMC0_CLK_CONN_EMMC0_CLK                   0x06000041
+                               SC_P_EMMC0_CMD_CONN_EMMC0_CMD                   0x21
+                               SC_P_EMMC0_DATA0_CONN_EMMC0_DATA0               0x21
+                               SC_P_EMMC0_DATA1_CONN_EMMC0_DATA1               0x21
+                               SC_P_EMMC0_DATA2_CONN_EMMC0_DATA2               0x21
+                               SC_P_EMMC0_DATA3_CONN_EMMC0_DATA3               0x21
+                               SC_P_EMMC0_DATA4_CONN_EMMC0_DATA4               0x21
+                               SC_P_EMMC0_DATA5_CONN_EMMC0_DATA5               0x21
+                               SC_P_EMMC0_DATA6_CONN_EMMC0_DATA6               0x21
+                               SC_P_EMMC0_DATA7_CONN_EMMC0_DATA7               0x21
+                               SC_P_EMMC0_STROBE_CONN_EMMC0_STROBE             0x41
+                               SC_P_EMMC0_RESET_B_CONN_EMMC0_RESET_B           0x21
+                       >;
+               };
+
+               pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
+                       fsl,pins = <
+                               SC_P_EMMC0_CLK_CONN_EMMC0_CLK                   0x06000041
+                               SC_P_EMMC0_CMD_CONN_EMMC0_CMD                   0x21
+                               SC_P_EMMC0_DATA0_CONN_EMMC0_DATA0               0x21
+                               SC_P_EMMC0_DATA1_CONN_EMMC0_DATA1               0x21
+                               SC_P_EMMC0_DATA2_CONN_EMMC0_DATA2               0x21
+                               SC_P_EMMC0_DATA3_CONN_EMMC0_DATA3               0x21
+                               SC_P_EMMC0_DATA4_CONN_EMMC0_DATA4               0x21
+                               SC_P_EMMC0_DATA5_CONN_EMMC0_DATA5               0x21
+                               SC_P_EMMC0_DATA6_CONN_EMMC0_DATA6               0x21
+                               SC_P_EMMC0_DATA7_CONN_EMMC0_DATA7               0x21
+                               SC_P_EMMC0_STROBE_CONN_EMMC0_STROBE             0x41
+                               SC_P_EMMC0_RESET_B_CONN_EMMC0_RESET_B           0x21
+                       >;
+               };
+
+               /* Apalis MMC1_CD# */
+               pinctrl_usdhc2_gpio: mmc1gpiogrp {
+                       fsl,pins = <
+                               SC_P_USDHC1_CD_B_LSIO_GPIO4_IO22                0x06000021      /* SODIMM 164 */
+                       >;
+               };
+
+               pinctrl_usdhc2_gpio_sleep: usdhc1gpioslpgrp {
+                       fsl,pins = <
+                               SC_P_USDHC1_CD_B_LSIO_GPIO4_IO22                0x60            /* SODIMM 164 */
+                       >;
+               };
+
+               /* Apalis USBH_EN */
+               pinctrl_usbh_en: usbhen {
+                       fsl,pins = <
+                               SC_P_USB_SS3_TC1_LSIO_GPIO4_IO04                0x40            /* SODIMM 84 */
+                       >;
+               };
+
+               /* Apalis MMC1 */
+               pinctrl_usdhc2: usdhc2grp {
+                       fsl,pins = <
+                               SC_P_USDHC1_CLK_CONN_USDHC1_CLK                 0x06000041      /* SODIMM 154 */
+                               SC_P_USDHC1_CMD_CONN_USDHC1_CMD                 0x21            /* SODIMM 150 */
+                               SC_P_USDHC1_DATA0_CONN_USDHC1_DATA0             0x21            /* SODIMM 160 */
+                               SC_P_USDHC1_DATA1_CONN_USDHC1_DATA1             0x21            /* SODIMM 162 */
+                               SC_P_USDHC1_DATA2_CONN_USDHC1_DATA2             0x21            /* SODIMM 144 */
+                               SC_P_USDHC1_DATA3_CONN_USDHC1_DATA3             0x21            /* SODIMM 146 */
+                               SC_P_USDHC1_VSELECT_CONN_USDHC1_VSELECT         0x21
+                       >;
+               };
+
+               pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
+                       fsl,pins = <
+                               SC_P_USDHC1_CLK_CONN_USDHC1_CLK                 0x06000041      /* SODIMM 154 */
+                               SC_P_USDHC1_CMD_CONN_USDHC1_CMD                 0x21            /* SODIMM 150 */
+                               SC_P_USDHC1_DATA0_CONN_USDHC1_DATA0             0x21            /* SODIMM 160 */
+                               SC_P_USDHC1_DATA1_CONN_USDHC1_DATA1             0x21            /* SODIMM 162 */
+                               SC_P_USDHC1_DATA2_CONN_USDHC1_DATA2             0x21            /* SODIMM 144 */
+                               SC_P_USDHC1_DATA3_CONN_USDHC1_DATA3             0x21            /* SODIMM 146 */
+                               SC_P_USDHC1_VSELECT_CONN_USDHC1_VSELECT         0x21
+                       >;
+               };
+
+               pinctrl_usdhc2_200mhz: usdhc2grp200mhz {
+                       fsl,pins = <
+                               SC_P_USDHC1_CLK_CONN_USDHC1_CLK                 0x06000041      /* SODIMM 154 */
+                               SC_P_USDHC1_CMD_CONN_USDHC1_CMD                 0x21            /* SODIMM 150 */
+                               SC_P_USDHC1_DATA0_CONN_USDHC1_DATA0             0x21            /* SODIMM 160 */
+                               SC_P_USDHC1_DATA1_CONN_USDHC1_DATA1             0x21            /* SODIMM 162 */
+                               SC_P_USDHC1_DATA2_CONN_USDHC1_DATA2             0x21            /* SODIMM 144 */
+                               SC_P_USDHC1_DATA3_CONN_USDHC1_DATA3             0x21            /* SODIMM 146 */
+                               SC_P_USDHC1_VSELECT_CONN_USDHC1_VSELECT         0x21
+                       >;
+               };
+
+               pinctrl_usdhc2_sleep: usdhc2slpgrp {
+                       fsl,pins = <
+                               SC_P_USDHC1_CLK_LSIO_GPIO4_IO23                 0x60            /* SODIMM 154 */
+                               SC_P_USDHC1_CMD_LSIO_GPIO4_IO24                 0x60            /* SODIMM 150 */
+                               SC_P_USDHC1_DATA0_LSIO_GPIO4_IO25               0x60            /* SODIMM 160 */
+                               SC_P_USDHC1_DATA1_LSIO_GPIO4_IO26               0x60            /* SODIMM 162 */
+                               SC_P_USDHC1_DATA2_LSIO_GPIO4_IO27               0x60            /* SODIMM 144 */
+                               SC_P_USDHC1_DATA3_LSIO_GPIO4_IO28               0x60            /* SODIMM 146 */
+                               SC_P_USDHC1_VSELECT_CONN_USDHC1_VSELECT         0x21
+                       >;
+               };
+       };
+};
+
+/* Apalis Gigabit LAN */
+&fec1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_fec1>;
+       fsl,magic-packet;
+       phy-handle = <&ethphy0>;
+       phy-mode = "rgmii";
+       phy-reset-duration = <10>;
+       phy-reset-post-delay = <150>;
+       phy-reset-gpios = <&gpio3 4 GPIO_ACTIVE_LOW>;
+       status = "okay";
+
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ethphy0: ethernet-phy at 4 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <4>;
+               };
+       };
+};
+
+/* Apalis UART1 */
+&lpuart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lpuart1>;
+       status = "okay";
+};
+
+/* On-module eMMC */
+&usdhc1 {
+       bus-width = <8>;
+       non-removable;
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+       pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+       status = "okay";
+};
+
+/* Apalis MMC1 */
+&usdhc2 {
+       bus-width = <4>;
+       cd-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+       pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
+       pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-3 = <&pinctrl_usdhc2_sleep>, <&pinctrl_usdhc2_gpio_sleep>;
+       disable-wp;
+       status = "okay";
+};
--

2.17.1

Signature · 5 lines
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
#5 lore raw

PATCH 2/7 board: toradex: add apalis-imx8x 2gb wb it v1.1a module support

In reply to Igor Opaniuk
Quoted 29 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

This commit adds initial support for the Toradex Apalis iMX8X 2GB WB IT V1.1A System on Module support [1].

Boot log:
U-Boot 2020.10-02940-g894aebb7e8-dirty (Oct 22 2020 - 09:43:57 +0300)

CPU:   NXP i.MX8QXP RevB A35 at 1200 MHz at 30C
DRAM:  2 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... OK
In:    serial at 5a070000
Out:   serial at 5a070000
Err:   serial at 5a070000
Model: Toradex Apalis iMX8 QuadXPlus 2GB Wi-Fi / BT IT V1.1A,
Serial# 06617018
Net:   eth0: ethernet at 5b040000 [PRIME]
Hit any key to stop autoboot:  0

Functionality wise the following is known to be working:
- eMMC and MMC/SD card
- Ethernet (*)
- GPIOs
- I2C

Unfortunately, there is no USB functionality for the i.MX 8QXP as of yet.

Quoted 6 lines

* With the SCU FW from the latest Toradex BSP 5.0.0 (SCU FW 1.5.1) ETH PHY encounters bring up problems after reset, this will be fixed soon on SCU FW side.

[1] https://www.toradex.com/computer-on-modules/apalis-arm-family/nxp-imx-8x

Quoted 515 lines

---

 arch/arm/mach-imx/imx8/Kconfig                |   6 +
 board/toradex/apalis-imx8x/Kconfig            |  30 ++++
 board/toradex/apalis-imx8x/MAINTAINERS        |  10 ++
 board/toradex/apalis-imx8x/Makefile           |   6 +
 .../apalis-imx8x/apalis-imx8x-imximage.cfg    |  24 +++
 board/toradex/apalis-imx8x/apalis-imx8x.c     | 131 +++++++++++++++
 configs/apalis-imx8x_defconfig                |  77 +++++++++
 include/configs/apalis-imx8x.h                | 149 ++++++++++++++++++
 8 files changed, 433 insertions(+)
 create mode 100644 board/toradex/apalis-imx8x/Kconfig
 create mode 100644 board/toradex/apalis-imx8x/MAINTAINERS
 create mode 100644 board/toradex/apalis-imx8x/Makefile
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
 create mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c
 create mode 100644 configs/apalis-imx8x_defconfig
 create mode 100644 include/configs/apalis-imx8x.h
arch/arm/mach-imx/imx8/Kconfig +6 -0
index 9d1f73dfc7..04b9729109 100644
@@ -65,6 +65,11 @@ config TARGET_COLIBRI_IMX8X
        select BOARD_LATE_INIT
        select IMX8QXP
 
+config TARGET_APALIS_IMX8X
+       bool "Support Apalis iMX8X module"
+       select BOARD_LATE_INIT
+       select IMX8QXP
+
 config TARGET_DENEB
        bool "Support i.MX8QXP Capricorn Deneb board"
        select BOARD_LATE_INIT
@@ -98,6 +103,7 @@ source "board/freescale/imx8qxp_mek/Kconfig"
 source "board/advantech/imx8qm_rom7720_a1/Kconfig"
 source "board/toradex/apalis-imx8/Kconfig"
 source "board/toradex/colibri-imx8x/Kconfig"
+source "board/toradex/apalis-imx8x/Kconfig"
 source "board/siemens/capricorn/Kconfig"
 
 config IMX_SNVS_SEC_SC
board/toradex/apalis-imx8x/Kconfig new file +30 -0
new file mode 100644
index 0000000000..ee61e09736
@@ -0,0 +1,30 @@
+if TARGET_APALIS_IMX8X
+
+config SYS_BOARD
+       default "apalis-imx8x"
+
+config SYS_VENDOR
+       default "toradex"
+
+config SYS_CONFIG_NAME
+       default "apalis-imx8x"
+
+config TDX_CFG_BLOCK
+       default y
+
+config TDX_HAVE_MMC
+       default y
+
+config TDX_CFG_BLOCK_DEV
+       default "0"
+
+config TDX_CFG_BLOCK_PART
+       default "1"
+
+# Toradex config block in eMMC, at the end of 1st "boot sector"
+config TDX_CFG_BLOCK_OFFSET
+       default "-512"
+
+source "board/toradex/common/Kconfig"
+
+endif
board/toradex/apalis-imx8x/MAINTAINERS new file +10 -0
new file mode 100644
index 0000000000..fbf9379931
@@ -0,0 +1,10 @@
+Apalis iMX8X
+M:     Igor Opaniuk <[email protected]>
+W:     http://developer.toradex.com/software/linux/linux-software
+S:     Maintained
+F:     arch/arm/dts/fsl-imx8x-apalis.dts
+F:     arch/arm/dts/fsl-imx8x-apalis-u-boot.dtsi
+F:     board/toradex/apalis-imx8x/
+F:     configs/apalis-imx8x_defconfig
+F:     doc/board/toradex/apalis-imx8x.rst
+F:     include/configs/apalis-imx8x.h
board/toradex/apalis-imx8x/Makefile new file +6 -0
new file mode 100644
index 0000000000..9d6e85b742
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright 2020 Toradex
+#
+
+obj-y += apalis-imx8x.o
board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg new file +24 -0
new file mode 100644
index 0000000000..58c62d0a65
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020 Toradex
+ *
+ * Refer doc/imx/mkimage/imx8image.txt for more details about how-to configure
+ * and create imx8image boot image
+ */
+
+#define __ASSEMBLY__
+
+/* Boot from SD, sector size 0x400 */
+BOOT_FROM EMMC_FASTBOOT 0x400
+/* SoC type IMX8QX */
+SOC_TYPE IMX8QX
+/* Append seco container image */
+APPEND mx8qx-ahab-container.img
+/* Create the 2nd container */
+CONTAINER
+/* Add scfw image with exec attribute */
+IMAGE SCU mx8qx-apalis-scfw-tcm.bin
+/* Add ATF image with exec attribute */
+IMAGE A35 bl31.bin 0x80000000
+/* Add U-Boot image with load attribute */
+DATA A35 u-boot-dtb.bin 0x80020000
board/toradex/apalis-imx8x/apalis-imx8x.c new file +131 -0
new file mode 100644
index 0000000000..9f00f26cfe
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2020 Toradex
+ */
+
+#include <common.h>
+#include <cpu_func.h>
+#include <init.h>
+
+#include <asm/arch/clock.h>
+#include <asm/arch/imx8-pins.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/sci/sci.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <env.h>
+#include <errno.h>
+#include <linux/libfdt.h>
+
+#include "../common/tdx-cfg-block.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define UART_PAD_CTRL  ((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \
+                        (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
+                        (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \
+                        (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
+
+static iomux_cfg_t uart1_pads[] = {
+       SC_P_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
+       SC_P_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+
+static void setup_iomux_uart(void)
+{
+       imx8_iomux_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
+}
+
+int board_early_init_f(void)
+{
+       sc_pm_clock_rate_t rate;
+       sc_err_t err = 0;
+
+       /*
+        * This works around that having only UART3 up the baudrate is 1.2M
+        * instead of 115.2k. Set UART0 clock root to 80 MHz
+        */
+       rate = 80000000;
+       err = sc_pm_set_clock_rate(-1, SC_R_UART_0, SC_PM_CLK_PER, &rate);
+       if (err != SC_ERR_NONE)
+               return 0;
+
+       /* Set UART3 clock root to 80 MHz and enable it */
+       rate = SC_80MHZ;
+       err = sc_pm_setup_uart(SC_R_UART_1, rate);
+       if (err != SC_ERR_NONE)
+               return 0;
+
+       setup_iomux_uart();
+
+       return 0;
+}
+
+#if IS_ENABLED(CONFIG_DM_GPIO)
+static void board_gpio_init(void)
+{
+       /* TODO */
+}
+#else
+static inline void board_gpio_init(void) {}
+#endif
+
+#if IS_ENABLED(CONFIG_FEC_MXC)
+#include <miiphy.h>
+
+int board_phy_config(struct phy_device *phydev)
+{
+       if (phydev->drv->config)
+               phydev->drv->config(phydev);
+
+       return 0;
+}
+#endif
+
+int checkboard(void)
+{
+       puts("Model: Toradex Apalis iMX8X\n");
+
+       build_info();
+       print_bootinfo();
+
+       return 0;
+}
+
+int board_init(void)
+{
+       board_gpio_init();
+
+       return 0;
+}
+
+/*
+ * Board specific reset that is system reset.
+ */
+void reset_cpu(ulong addr)
+{
+       /* TODO */
+}
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+int ft_board_setup(void *blob, struct bd_info *bd)
+{
+       return ft_common_board_setup(blob, bd);
+}
+#endif
+
+int board_mmc_get_env_dev(int devno)
+{
+       return devno;
+}
+
+int board_late_init(void)
+{
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+/* TODO move to common */
+       env_set("board_name", "Apalis iMX8X");
+#endif
+
+       return 0;
+}
configs/apalis-imx8x_defconfig new file +77 -0
new file mode 100644
index 0000000000..e6aa575380
@@ -0,0 +1,77 @@
+CONFIG_ARM=y
+CONFIG_ARCH_IMX8=y
+CONFIG_SYS_TEXT_BASE=0x80020000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_NR_DRAM_BANKS=3
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0xFFFFDE00
+CONFIG_DM_GPIO=y
+CONFIG_TARGET_APALIS_IMX8X=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-apalis"
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg"
+CONFIG_BOOTDELAY=1
+CONFIG_LOG=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_SYS_PROMPT="Apalis iMX8X # "
+CONFIG_CMD_CPU=y
+# CONFIG_BOOTM_NETBSD is not set
+CONFIG_CMD_ASKENV=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_SYS_MEMTEST_START=0x88000000
+CONFIG_SYS_MEMTEST_END=0x89000000
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DM=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_UUID=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
+CONFIG_VERSION_VARIABLE=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_IP_DEFRAG=y
+CONFIG_TFTP_BLOCKSIZE=4096
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
+CONFIG_CLK_IMX8=y
+CONFIG_CPU=y
+CONFIG_MXC_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_IMX_LPI2C=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_MISC=y
+CONFIG_DM_MMC=y
+CONFIG_FSL_USDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_ADDR_ENABLE=y
+CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
+CONFIG_DM_ETH=y
+CONFIG_FEC_MXC_SHARE_MDIO=y
+CONFIG_FEC_MXC_MDIO_BASE=0x5B040000
+CONFIG_FEC_MXC=y
+CONFIG_MII=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX8=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_IMX8_POWER_DOMAIN=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SERIAL=y
+CONFIG_FSL_LPUART=y
+CONFIG_DM_THERMAL=y
+CONFIG_IMX_SCU_THERMAL=y
+# CONFIG_EFI_LOADER is not set
include/configs/apalis-imx8x.h new file +149 -1
new file mode 100644
index 0000000000..db31c210f5
@@ -0,0 +1,149 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2020 Toradex
+ */
+
+#ifndef __APALIS_IMX8X_H
+#define __APALIS_IMX8X_H
+
+#include <asm/arch/imx-regs.h>
+#include <linux/sizes.h>
+#include <linux/stringify.h>
+
+#define CONFIG_REMAKE_ELF
+
+#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define USDHC1_BASE_ADDR               0x5b010000
+#define USDHC2_BASE_ADDR               0x5b020000
+#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
+
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
+#define CONFIG_TFTP_TSIZE
+
+#define CONFIG_IPADDR                  192.168.10.2
+#define CONFIG_NETMASK                 255.255.255.0
+#define CONFIG_SERVERIP                        192.168.10.1
+
+#define FEC_ENET_ENABLE_TXC_DELAY
+#define FEC_ENET_ENABLE_RXC_DELAY
+
+#define MEM_LAYOUT_ENV_SETTINGS \
+       "kernel_addr_r=0x80280000\0" \
+       "fdt_addr_r=0x83100000\0" \
+       "ramdisk_addr_r=0x8a000000\0" \
+       "scriptaddr=0x83200000\0"
+
+#ifdef CONFIG_AHAB_BOOT
+#define AHAB_ENV "sec_boot=yes\0"
+#else
+#define AHAB_ENV "sec_boot=no\0"
+#endif
+
+/* Boot M4 */
+#define M4_BOOT_ENV \
+       "m4_0_image=m4_0.bin\0" \
+       "loadm4image_0=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
+               "${m4_0_image}\0" \
+       "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
+
+#define MFG_NAND_PARTITION ""
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 0) \
+       func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#undef BOOTENV_RUN_NET_USB_START
+#define BOOTENV_RUN_NET_USB_START ""
+
+#define CONFIG_MFG_ENV_SETTINGS \
+       "mfgtool_args=setenv bootargs ${consoleargs} " \
+               "rdinit=/linuxrc g_mass_storage.stall=0 " \
+               "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
+               "g_mass_storage.idProduct=0x37FF " \
+               "g_mass_storage.iSerialNumber=\"\" " MFG_NAND_PARTITION \
+               "${vidargs} clk_ignore_unused\0" \
+       "initrd_addr=0x83800000\0" \
+       "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} " \
+               "${fdt_addr};\0" \
+
+/* Initial environment variables */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       AHAB_ENV \
+       BOOTENV \
+       CONFIG_MFG_ENV_SETTINGS \
+       M4_BOOT_ENV \
+       MEM_LAYOUT_ENV_SETTINGS \
+       "boot_file=Image\0" \
+       "consoleargs=console=ttyLP3,${baudrate} earlycon\0" \
+       "fdt_file=imx8qxp-apalis-eval.dtb\0" \
+       "fdtfile=imx8qxp-apalis-eval.dtb\0" \
+       "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
+       "image=Image\0" \
+       "initrd_addr=0x83800000\0" \
+       "mmcargs=setenv bootargs ${consoleargs} " \
+               "root=PARTUUID=${uuid} rootwait " \
+       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "netargs=setenv bootargs ${consoleargs} " \
+               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
+               "${vidargs}\0" \
+       "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
+               "apalis-imx8x/${fdt_file}; booti ${loadaddr} - " \
+               "${fdt_addr}\0" \
+       "panel=NULL\0" \
+       "script=boot.scr\0" \
+       "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
+               "if test \"$confirm\" = \"y\"; then " \
+               "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
+               "${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \
+               "${blkcnt}; fi\0" \
+       "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
+
+/* Link Definitions */
+#define CONFIG_LOADADDR                        0x89000000
+
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+
+#define CONFIG_SYS_INIT_SP_ADDR                0x80200000
+
+/* Environment in eMMC, before config block at the end of 1st "boot sector" */
+
+#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
+
+/* On Apalis iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
+#define CONFIG_SYS_FSL_USDHC_NUM       2
+
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M /* Increase max gunzip size */
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN          ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024)
+
+#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define PHYS_SDRAM_1                   0x80000000
+#define PHYS_SDRAM_2                   0x880000000
+#define PHYS_SDRAM_1_SIZE              SZ_2G           /* 2 GB */
+#define PHYS_SDRAM_2_SIZE              0x00000000      /* 0 GB */
+
+/* Monitor Command Prompt */
+#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
+#define CONFIG_SYS_CBSIZE              SZ_2K
+#define CONFIG_SYS_MAXARGS             64
+#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
+                                       sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/* Generic Timer Definitions */
+#define COUNTER_FREQUENCY              8000000 /* 8MHz */
+
+/* Networking */
+#define CONFIG_FEC_ENET_DEV 0
+#define IMX_FEC_BASE                   0x5b040000
+#define CONFIG_FEC_MXC_PHYADDR          0x4
+#define CONFIG_ETHPRIME                 "eth0"
+#define CONFIG_FEC_XCV_TYPE            RGMII
+#define FEC_QUIRK_ENET_MAC
+#define PHY_ANEG_TIMEOUT 20000
+
+#endif /* __APALIS_IMX8X_H */
--

2.17.1

Signature · 5 lines
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
#9 lore raw

PATCH 3/7 doc: board: apalis-imx8x: add documentation

In reply to Igor Opaniuk
Quoted 6 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

This documents the u-boot build and deployment procedure.

Quoted 102 lines

---

 doc/board/toradex/apalix-imx8x.rst | 74 ++++++++++++++++++++++++++++++
 doc/board/toradex/index.rst        |  1 +
 2 files changed, 75 insertions(+)
 create mode 100644 doc/board/toradex/apalix-imx8x.rst
doc/board/toradex/apalix-imx8x.rst new file +74 -0
new file mode 100644
index 0000000000..ce7dde8d00
@@ -0,0 +1,74 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Apalis iMX8X V1.1A Module
+==========================
+
+Quick Start
+-----------
+
+- Build the ARM trusted firmware binary
+- Get scfw_tcm.bin and ahab-container.img
+- Build U-Boot
+- Load U-Boot binary using uuu
+- Flash U-Boot binary into the eMMC
+- Boot
+
+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
+
+Get scfw_tcm.bin and ahab-container.img
+---------------------------------------
+
+.. code-block:: bash
+
+    $ wget https://github.com/toradex/i.MX-System-Controller-Firmware/blob/master/src/scfw_export_mx8qx_b0/build_mx8qx_b0/mx8qx-apalis-scfw-tcm.bin
+    $ 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
+
+Copy the following binaries to the U-Boot folder:
+
+.. 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
+
+Build U-Boot
+------------
+.. code-block:: bash
+
+    $ make apalis-imx8x_defconfig
+    $ make u-boot-dtb.imx
+
+Load the U-Boot Binary Using UUU
+--------------------------------
+
+Get the latest version of the universal update utility (uuu) aka ``mfgtools 3.0``:
+
+https://community.nxp.com/external-link.jspa?url=https%3A%2F%2Fgithub.com%2FNXPmicro%2Fmfgtools%2Freleases
+
+Put the module into USB recovery aka serial downloader mode, connect USB device
+to your host and execute uuu:
+
+.. code-block:: bash
+
+    sudo ./uuu u-boot/u-boot-dtb.imx
+
+Flash the U-Boot Binary into the eMMC
+-------------------------------------
+
+Burn the ``u-boot-dtb.imx`` binary to the primary eMMC hardware boot area
+partition and boot:
+
+.. code-block:: bash
+
+    load mmc 1:1 $loadaddr u-boot-dtb.imx
+    setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200
+    mmc dev 0 1
+    mmc write ${loadaddr} 0x0 ${blkcnt}
doc/board/toradex/index.rst +1 -1
index 16b5a0770d..abba648f86 100644
@@ -7,6 +7,7 @@ Toradex
    :maxdepth: 2
 
    apalix-imx8
+   apalix-imx8x
    colibri_imx7
    colibri-imx8x
    verdin-imx8mm
--

2.17.1

Signature · 5 lines
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
#12 lore raw

PATCH 4/7 imx8: allow overriding memory layout

In reply to Igor Opaniuk
Quoted 9 lines · Igor Opaniuk

From: Marcel Ziswiler <[email protected]>

Introduce weak function board_mem_get_layout() which allows overriding the memory layout from board code in runtime, useful for handling different SKU versions.

Quoted 229 lines

---

 arch/arm/include/asm/mach-imx/sys_proto.h |  5 ++
 arch/arm/mach-imx/imx8/cpu.c              | 96 ++++++++++++++++-------
 2 files changed, 72 insertions(+), 29 deletions(-)
arch/arm/include/asm/mach-imx/sys_proto.h +5 -0
index 5f0c1ae218..43eae6d796 100644
@@ -183,6 +183,11 @@ void init_src(void);
 void init_snvs(void);
 void imx_wdog_disable_powerdown(void);
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+                         u64 *phys_sdram_1_size,
+                         u64 *phys_sdram_2_start,
+                         u64 *phys_sdram_2_size);
+
 int arch_auxiliary_core_check_up(u32 core_id);
 
 int board_mmc_get_env_dev(int devno);
arch/arm/mach-imx/imx8/cpu.c +67 -30
index 38b2c0926f..911d6a51d1 100644
@@ -260,14 +260,30 @@ static int get_owned_memreg(sc_rm_mr_t mr, sc_faddr_t *addr_start,
        return -EINVAL;
 }
 
+__weak void board_mem_get_layout(u64 *phys_sdram_1_start,
+                                u64 *phys_sdram_1_size,
+                                u64 *phys_sdram_2_start,
+                                u64 *phys_sdram_2_size)
+{
+       *phys_sdram_1_start = PHYS_SDRAM_1;
+       *phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
+       *phys_sdram_2_start = PHYS_SDRAM_2;
+       *phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
+}
+
 phys_size_t get_effective_memsize(void)
 {
        sc_rm_mr_t mr;
        sc_faddr_t start, end, end1, start_aligned;
+       u64 phys_sdram_1_start, phys_sdram_1_size;
+       u64 phys_sdram_2_start, phys_sdram_2_size;
        int err;
 
-       end1 = (sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE;
+       board_mem_get_layout(&phys_sdram_1_start, &phys_sdram_1_size,
+                            &phys_sdram_2_start, &phys_sdram_2_size);
+
 
+       end1 = (sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size;
        for (mr = 0; mr < 64; mr++) {
                err = get_owned_memreg(mr, &start, &end);
                if (!err) {
@@ -277,29 +293,35 @@ phys_size_t get_effective_memsize(void)
                                continue;
 
                        /* Find the memory region runs the U-Boot */
-                       if (start >= PHYS_SDRAM_1 && start <= end1 &&
+                       if (start >= phys_sdram_1_start && start <= end1 &&
                            (start <= CONFIG_SYS_TEXT_BASE &&
                            end >= CONFIG_SYS_TEXT_BASE)) {
-                               if ((end + 1) <= ((sc_faddr_t)PHYS_SDRAM_1 +
-                                   PHYS_SDRAM_1_SIZE))
-                                       return (end - PHYS_SDRAM_1 + 1);
+                               if ((end + 1) <=
+                                   ((sc_faddr_t)phys_sdram_1_start +
+                                   phys_sdram_1_size))
+                                       return (end - phys_sdram_1_start + 1);
                                else
-                                       return PHYS_SDRAM_1_SIZE;
+                                       return phys_sdram_1_size;
                        }
                }
        }
 
-       return PHYS_SDRAM_1_SIZE;
+       return phys_sdram_1_size;
 }
 
 int dram_init(void)
 {
        sc_rm_mr_t mr;
        sc_faddr_t start, end, end1, end2;
+       u64 phys_sdram_1_start, phys_sdram_1_size;
+       u64 phys_sdram_2_start, phys_sdram_2_size;
        int err;
 
-       end1 = (sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE;
-       end2 = (sc_faddr_t)PHYS_SDRAM_2 + PHYS_SDRAM_2_SIZE;
+       board_mem_get_layout(&phys_sdram_1_start, &phys_sdram_1_size,
+                            &phys_sdram_2_start, &phys_sdram_2_size);
+
+       end1 = (sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size;
+       end2 = (sc_faddr_t)phys_sdram_2_start + phys_sdram_2_size;
        for (mr = 0; mr < 64; mr++) {
                err = get_owned_memreg(mr, &start, &end);
                if (!err) {
@@ -308,12 +330,13 @@ int dram_init(void)
                        if (start > end)
                                continue;
 
-                       if (start >= PHYS_SDRAM_1 && start <= end1) {
+                       if (start >= phys_sdram_1_start && start <= end1) {
                                if ((end + 1) <= end1)
                                        gd->ram_size += end - start + 1;
                                else
                                        gd->ram_size += end1 - start;
-                       } else if (start >= PHYS_SDRAM_2 && start <= end2) {
+                       } else if (start >= phys_sdram_2_start &&
+                                  start <= end2) {
                                if ((end + 1) <= end2)
                                        gd->ram_size += end - start + 1;
                                else
@@ -324,8 +347,8 @@ int dram_init(void)
 
        /* If error, set to the default value */
        if (!gd->ram_size) {
-               gd->ram_size = PHYS_SDRAM_1_SIZE;
-               gd->ram_size += PHYS_SDRAM_2_SIZE;
+               gd->ram_size = phys_sdram_1_size;
+               gd->ram_size += phys_sdram_2_size;
        }
        return 0;
 }
@@ -358,11 +381,15 @@ int dram_init_banksize(void)
        sc_rm_mr_t mr;
        sc_faddr_t start, end, end1, end2;
        int i = 0;
+       u64 phys_sdram_1_start, phys_sdram_1_size;
+       u64 phys_sdram_2_start, phys_sdram_2_size;
        int err;
 
-       end1 = (sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE;
-       end2 = (sc_faddr_t)PHYS_SDRAM_2 + PHYS_SDRAM_2_SIZE;
+       board_mem_get_layout(&phys_sdram_1_start, &phys_sdram_1_size,
+                            &phys_sdram_2_start, &phys_sdram_2_size);
 
+       end1 = (sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size;
+       end2 = (sc_faddr_t)phys_sdram_2_start + phys_sdram_2_size;
        for (mr = 0; mr < 64 && i < CONFIG_NR_DRAM_BANKS; mr++) {
                err = get_owned_memreg(mr, &start, &end);
                if (!err) {
@@ -370,7 +397,7 @@ int dram_init_banksize(void)
                        if (start > end) /* Small memory region, no use it */
                                continue;
 
-                       if (start >= PHYS_SDRAM_1 && start <= end1) {
+                       if (start >= phys_sdram_1_start && start <= end1) {
                                gd->bd->bi_dram[i].start = start;
 
                                if ((end + 1) <= end1)
@@ -381,7 +408,7 @@ int dram_init_banksize(void)
 
                                dram_bank_sort(i);
                                i++;
-                       } else if (start >= PHYS_SDRAM_2 && start <= end2) {
+                       } else if (start >= phys_sdram_2_start && start <= end2) {
                                gd->bd->bi_dram[i].start = start;
 
                                if ((end + 1) <= end2)
@@ -398,10 +425,10 @@ int dram_init_banksize(void)
 
        /* If error, set to the default value */
        if (!i) {
-               gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-               gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-               gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-               gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
+               gd->bd->bi_dram[0].start = phys_sdram_1_start;
+               gd->bd->bi_dram[0].size = phys_sdram_1_size;
+               gd->bd->bi_dram[1].start = phys_sdram_2_start;
+               gd->bd->bi_dram[1].size = phys_sdram_2_size;
        }
 
        return 0;
@@ -411,11 +438,16 @@ static u64 get_block_attrs(sc_faddr_t addr_start)
 {
        u64 attr = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE |
                PTE_BLOCK_PXN | PTE_BLOCK_UXN;
+       u64 phys_sdram_1_start, phys_sdram_1_size;
+       u64 phys_sdram_2_start, phys_sdram_2_size;
+
+       board_mem_get_layout(&phys_sdram_1_start, &phys_sdram_1_size,
+                            &phys_sdram_2_start, &phys_sdram_2_size);
 
-       if ((addr_start >= PHYS_SDRAM_1 &&
-            addr_start <= ((sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)) ||
-           (addr_start >= PHYS_SDRAM_2 &&
-            addr_start <= ((sc_faddr_t)PHYS_SDRAM_2 + PHYS_SDRAM_2_SIZE)))
+       if ((addr_start >= phys_sdram_1_start &&
+            addr_start <= ((sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size)) ||
+           (addr_start >= phys_sdram_2_start &&
+            addr_start <= ((sc_faddr_t)phys_sdram_2_start + phys_sdram_2_size)))
                return (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE);
 
        return attr;
@@ -424,14 +456,20 @@ static u64 get_block_attrs(sc_faddr_t addr_start)
 static u64 get_block_size(sc_faddr_t addr_start, sc_faddr_t addr_end)
 {
        sc_faddr_t end1, end2;
+       u64 phys_sdram_1_start, phys_sdram_1_size;
+       u64 phys_sdram_2_start, phys_sdram_2_size;
+
+       board_mem_get_layout(&phys_sdram_1_start, &phys_sdram_1_size,
+                            &phys_sdram_2_start, &phys_sdram_2_size);
+
 
-       end1 = (sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE;
-       end2 = (sc_faddr_t)PHYS_SDRAM_2 + PHYS_SDRAM_2_SIZE;
+       end1 = (sc_faddr_t)phys_sdram_1_start + phys_sdram_1_size;
+       end2 = (sc_faddr_t)phys_sdram_2_start + phys_sdram_2_size;
 
-       if (addr_start >= PHYS_SDRAM_1 && addr_start <= end1) {
+       if (addr_start >= phys_sdram_1_start && addr_start <= end1) {
                if ((addr_end + 1) > end1)
                        return end1 - addr_start;
-       } else if (addr_start >= PHYS_SDRAM_2 && addr_start <= end2) {
+       } else if (addr_start >= phys_sdram_2_start && addr_start <= end2) {
                if ((addr_end + 1) > end2)
                        return end2 - addr_start;
        }
--

2.17.1

Signature · 5 lines
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
#15 lore raw

PATCH 5/7 apalis-imx8: add implementation for board_mem_get_layout

In reply to Igor Opaniuk
Quoted 7 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add implementation of board_mem_get_layout for overriding the memory layout.

Quoted 42 lines

---

 board/toradex/apalis-imx8/apalis-imx8.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
board/toradex/apalis-imx8/apalis-imx8.c +23 -1
index 9263b0f51f..2ed66261d2 100644
@@ -37,6 +37,29 @@ static void setup_iomux_uart(void)
        imx8_iomux_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
 }
 
+void board_mem_get_layout(u64 *phys_sdram_1_start,
+                         u64 *phys_sdram_1_size,
+                         u64 *phys_sdram_2_start,
+                         u64 *phys_sdram_2_size)
+{
+       u32 is_quadplus = 0, val = 0;
+       sc_err_t scierr = sc_misc_otp_fuse_read(-1, 6, &val);
+
+       if (scierr == SC_ERR_NONE) {
+               /* QP has one A72 core disabled */
+               is_quadplus = ((val >> 4) & 0x3) != 0x0;
+       }
+
+       *phys_sdram_1_start = PHYS_SDRAM_1;
+       *phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
+       *phys_sdram_2_start = PHYS_SDRAM_2;
+       if (is_quadplus)
+               /* Our QP based SKUs only have 2 GB RAM (PHYS_SDRAM_1_SIZE) */
+               *phys_sdram_2_size = 0x0UL;
+       else
+               *phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
+}
+
 int board_early_init_f(void)
 {
        sc_pm_clock_rate_t rate = SC_80MHZ;
--

2.17.1

Signature · 5 lines
Best regards
Oleksandr Suvorov

Toradex AG
Ebenaustrasse 10 | 6048 Horw | Switzerland | T: +41 41 500 48 00
#6 lore raw

PATCH 2/7 board: toradex: add apalis-imx8x 2gb wb it v1.1a module support

In reply to Igor Opaniuk
Quoted 5 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

* With the SCU FW from the latest Toradex BSP 5.0.0 (SCU FW 1.5.1) ETH PHY encounters bring up problems after reset, this will be fixed soon on SCU FW side.

Hello Igor,

are these ETH Phy problems also in NXP provided SCU FW 1.5.1/ 1.6.0?

Because I observe some phy clk issue after upgrading from SCU FW 1.2.6 to 1.5.1/1.6.0. (iMX8QM)

Best regards,

Oliver

#7 lore raw

PATCH 2/7 board: toradex: add apalis-imx8x 2gb wb it v1.1a module support

In reply to Igor Opaniuk
Quoted 27 lines

From: Igor Opaniuk <[email protected]>
This commit adds initial support for the Toradex Apalis iMX8X 2GB WB IT V1.1A System on Module support [1].
Boot log:
U-Boot 2020.10-02940-g894aebb7e8-dirty (Oct 22 2020 - 09:43:57 +0300)

CPU:   NXP i.MX8QXP RevB A35 at 1200 MHz at 30C
DRAM:  2 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
Loading Environment from MMC... OK
In:    serial at 5a070000
Out:   serial at 5a070000
Err:   serial at 5a070000
Model: Toradex Apalis iMX8 QuadXPlus 2GB Wi-Fi / BT IT V1.1A,
Serial# 06617018
Net:   eth0: ethernet at 5b040000 [PRIME]
Hit any key to stop autoboot:  0

Functionality wise the following is known to be working:
- eMMC and MMC/SD card
- Ethernet (*)
- GPIOs
- I2C
Unfortunately, there is no USB functionality for the i.MX 8QXP as of yet.
* With the SCU FW from the latest Toradex BSP 5.0.0 (SCU FW 1.5.1) ETH PHY encounters bring up problems after reset, this will be fixed soon on SCU FW side.
[1] https://www.toradex.com/computer-on-modules/apalis-arm-family/nxp-imx-8x

Quoted 2 lines

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#10 lore raw

PATCH 3/7 doc: board: apalis-imx8x: add documentation

In reply to Igor Opaniuk
Quoted 4 lines

From: Igor Opaniuk <[email protected]> This documents the u-boot build and deployment procedure.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#18 lore raw

PATCH 6/7 apalis-imx8x: add implementation for board_mem_get_layout

In reply to Igor Opaniuk
Quoted 4 lines

From: Igor Opaniuk <[email protected]>
Add implementation of board_mem_get_layout for overriding the memory layout.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#16 lore raw

PATCH 5/7 apalis-imx8: add implementation for board_mem_get_layout

In reply to Igor Opaniuk
Quoted 5 lines

From: Igor Opaniuk <[email protected]>
Add implementation of board_mem_get_layout for overriding the memory layout.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#20 lore raw

PATCH 7/7 colibri-imx8x: add implementation for board_mem_get_layout

In reply to Igor Opaniuk
Quoted 4 lines

From: Igor Opaniuk <[email protected]>
Add implementation of board_mem_get_layout for overriding the memory layout.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 1/7 ARM: dts: fsl-imx8qxp-apalis: add initial device tree

In reply to Igor Opaniuk
Quoted 5 lines

From: Igor Opaniuk <[email protected]> Introduce initial hierarchy of device trees for Apalis iMX8X System on Module.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#13 lore raw

PATCH 4/7 imx8: allow overriding memory layout

In reply to Igor Opaniuk
Quoted 7 lines

From: Marcel Ziswiler <[email protected]> Introduce weak function board_mem_get_layout() which allows overriding the memory layout from board code in runtime, useful for handling different SKU versions.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================