All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 00/11] toradex updates: assortment of fixes and improvements
@ 2022-04-13  9:33 Marcel Ziswiler
  2022-04-13  9:33 ` [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x Marcel Ziswiler
                   ` (10 more replies)
  0 siblings, 11 replies; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot
  Cc: Marcel Ziswiler, Alper Nebi Yasak, Andre Przywara, Bharat Gooty,
	Christian Hewitt, Denys Drozdov, Fabio Estevam,
	Francesco Dolcini, Gaurav Jain, Heinrich Schuchardt,
	Horia Geantă,
	Igor Opaniuk, Lokesh Vutla, NXP i.MX U-Boot Team, Neil Armstrong,
	Oliver Graute, Patrick Delaunay, Peng Fan, Rayagonda Kokatanur,
	Rick Chen, Sean Anderson, Simon Glass, Sinthu Raja, Stefan Roese,
	Stefano Babic, Tero Kristo, Ying-Chun Liu (PaulLiu)

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>


This series contains an assortment of fixes and improvements for Toradex
computer/system on modules (CoM/SoM).

We also drop support for the Apalis iMX8X and the Colibri PXA270. The
former never evolved beyond the sample state and we no longer support
it. The latter is EOL since a while.

Changes in v2:
- Also drop setup_dcemode_uart() and setup_iomux_dce_uart() which are
  now unused.
- Re-based on top of Stefano's imx/master-next which dropped 13 commits
  already applied.

Denys Drozdov (1):
  toradex: apalis-imx8x: drop support for apalis imx8x

Igor Opaniuk (3):
  toradex: globally disable video support
  toradex: set default dhcp distroboot scriptname
  toradex: drop legacy nfsboot script

Marcel Ziswiler (4):
  board: toradex: drop colibri pxa270 support
  board: colibri_imx7: fix usb start on solo
  configs: tdx: apalis_imx6: drop hw v1.0 support
  configs: tdx: apalis/colibri_imx6: use preboot as well

Oleksandr Suvorov (2):
  configs: toradex: enable missing fit options
  configs: colibri-imx7/-emmc: enable booting from usb sdp

Philippe Schenker (1):
  configs: tdx: Do not overwrite fdtfile if it got set manually

 arch/arm/Kconfig                              |   6 -
 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/mach-imx/imx8/Kconfig                |   6 -
 board/toradex/apalis-imx8x/Kconfig            |  33 ---
 board/toradex/apalis-imx8x/MAINTAINERS        |  10 -
 board/toradex/apalis-imx8x/Makefile           |   6 -
 .../apalis-imx8x/apalis-imx8x-imximage.cfg    |  23 --
 board/toradex/apalis-imx8x/apalis-imx8x.c     | 155 ----------
 board/toradex/apalis_imx6/apalis_imx6.c       |  38 +--
 board/toradex/colibri_imx7/colibri_imx7.c     |  40 +--
 board/toradex/colibri_pxa270/Kconfig          |  23 --
 board/toradex/colibri_pxa270/MAINTAINERS      |   6 -
 board/toradex/colibri_pxa270/Makefile         |   7 -
 board/toradex/colibri_pxa270/colibri_pxa270.c | 153 ----------
 board/toradex/common/tdx-cfg-block.c          |  32 +-
 configs/apalis-imx8_defconfig                 |   1 +
 configs/apalis-imx8x_defconfig                |  82 ------
 configs/apalis-tk1_defconfig                  |   1 +
 configs/apalis_imx6_defconfig                 |  13 +-
 configs/colibri-imx6ull-emmc_defconfig        |  10 +-
 configs/colibri-imx6ull_defconfig             |  11 +-
 configs/colibri-imx8x_defconfig               |   1 +
 configs/colibri_imx6_defconfig                |  13 +-
 configs/colibri_imx7_defconfig                |  14 +-
 configs/colibri_imx7_emmc_defconfig           |  11 +-
 configs/colibri_pxa270_defconfig              |  57 ----
 configs/colibri_t20_defconfig                 |   5 -
 configs/colibri_vf_defconfig                  |   7 +-
 configs/verdin-imx8mm_defconfig               |   3 +-
 configs/verdin-imx8mp_defconfig               |   2 +-
 doc/board/toradex/apalis-imx8x.rst            |  77 -----
 doc/board/toradex/index.rst                   |   1 -
 include/configs/apalis-imx8.h                 |   6 +-
 include/configs/apalis-imx8x.h                | 127 --------
 include/configs/apalis-tk1.h                  |  12 +-
 include/configs/apalis_imx6.h                 |  21 +-
 include/configs/apalis_t30.h                  |   3 +-
 include/configs/colibri-imx6ull.h             |  11 +-
 include/configs/colibri-imx8x.h               |   7 +-
 include/configs/colibri_imx6.h                |  16 +-
 include/configs/colibri_imx7.h                |  11 +-
 include/configs/colibri_pxa270.h              | 151 ----------
 include/configs/colibri_t20.h                 |   1 +
 include/configs/colibri_t30.h                 |   3 +-
 include/configs/colibri_vf.h                  |  11 +-
 include/configs/pxa-common.h                  |  27 --
 include/configs/verdin-imx8mm.h               |   7 +-
 include/configs/verdin-imx8mp.h               |   6 -
 50 files changed, 53 insertions(+), 1632 deletions(-)
 delete mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
 delete mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts
 delete mode 100644 board/toradex/apalis-imx8x/Kconfig
 delete mode 100644 board/toradex/apalis-imx8x/MAINTAINERS
 delete mode 100644 board/toradex/apalis-imx8x/Makefile
 delete mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
 delete mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c
 delete mode 100644 board/toradex/colibri_pxa270/Kconfig
 delete mode 100644 board/toradex/colibri_pxa270/MAINTAINERS
 delete mode 100644 board/toradex/colibri_pxa270/Makefile
 delete mode 100644 board/toradex/colibri_pxa270/colibri_pxa270.c
 delete mode 100644 configs/apalis-imx8x_defconfig
 delete mode 100644 configs/colibri_pxa270_defconfig
 delete mode 100644 doc/board/toradex/apalis-imx8x.rst
 delete mode 100644 include/configs/apalis-imx8x.h
 delete mode 100644 include/configs/colibri_pxa270.h
 delete mode 100644 include/configs/pxa-common.h

-- 
2.34.1


^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:25   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 02/11] toradex: globally disable video support Marcel Ziswiler
                   ` (9 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot
  Cc: Denys Drozdov, Marcel Ziswiler, Alper Nebi Yasak, Andre Przywara,
	Christian Hewitt, Fabio Estevam, Francesco Dolcini, Gaurav Jain,
	Heinrich Schuchardt, Horia Geantă,
	Igor Opaniuk, Lokesh Vutla, NXP i.MX U-Boot Team, Neil Armstrong,
	Oliver Graute, Peng Fan, Rick Chen, Sean Anderson, Simon Glass,
	Sinthu Raja, Stefano Babic, Tero Kristo, Ying-Chun Liu (PaulLiu)

From: Denys Drozdov <denys.drozdov@toradex.com>

Drop Apalis iMX8X platform as it never left sample state and is no
longer supported.

Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 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/mach-imx/imx8/Kconfig                |   6 -
 board/toradex/apalis-imx8x/Kconfig            |  33 ---
 board/toradex/apalis-imx8x/MAINTAINERS        |  10 -
 board/toradex/apalis-imx8x/Makefile           |   6 -
 .../apalis-imx8x/apalis-imx8x-imximage.cfg    |  23 --
 board/toradex/apalis-imx8x/apalis-imx8x.c     | 155 ----------
 board/toradex/common/tdx-cfg-block.c          |  13 +-
 configs/apalis-imx8x_defconfig                |  82 ------
 doc/board/toradex/apalis-imx8x.rst            |  77 -----
 doc/board/toradex/index.rst                   |   1 -
 include/configs/apalis-imx8x.h                | 127 --------
 14 files changed, 1 insertion(+), 950 deletions(-)
 delete mode 100644 arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
 delete mode 100644 arch/arm/dts/fsl-imx8qxp-apalis.dts
 delete mode 100644 board/toradex/apalis-imx8x/Kconfig
 delete mode 100644 board/toradex/apalis-imx8x/MAINTAINERS
 delete mode 100644 board/toradex/apalis-imx8x/Makefile
 delete mode 100644 board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
 delete mode 100644 board/toradex/apalis-imx8x/apalis-imx8x.c
 delete mode 100644 configs/apalis-imx8x_defconfig
 delete mode 100644 doc/board/toradex/apalis-imx8x.rst
 delete mode 100644 include/configs/apalis-imx8x.h

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index df7b4addf99..fe9383fe90b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -891,7 +891,6 @@ 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
diff --git a/arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
deleted file mode 100644
index e41911a04aa..00000000000
--- a/arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi
+++ /dev/null
@@ -1,139 +0,0 @@
-// 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;
-};
diff --git a/arch/arm/dts/fsl-imx8qxp-apalis.dts b/arch/arm/dts/fsl-imx8qxp-apalis.dts
deleted file mode 100644
index 9cb3d3a809b..00000000000
--- a/arch/arm/dts/fsl-imx8qxp-apalis.dts
+++ /dev/null
@@ -1,278 +0,0 @@
-// 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@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-id";
-	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@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";
-};
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index f969833baba..5e1b20a4229 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -54,11 +54,6 @@ 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
@@ -105,7 +100,6 @@ source "board/congatec/cgtqmx8/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
diff --git a/board/toradex/apalis-imx8x/Kconfig b/board/toradex/apalis-imx8x/Kconfig
deleted file mode 100644
index d6cda7e3ff0..00000000000
--- a/board/toradex/apalis-imx8x/Kconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-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"
-
-config IMX_CONFIG
-	default "board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg"
-
-source "board/toradex/common/Kconfig"
-
-endif
diff --git a/board/toradex/apalis-imx8x/MAINTAINERS b/board/toradex/apalis-imx8x/MAINTAINERS
deleted file mode 100644
index 93d6cdd4742..00000000000
--- a/board/toradex/apalis-imx8x/MAINTAINERS
+++ /dev/null
@@ -1,10 +0,0 @@
-Apalis iMX8X
-M:	Marcel Ziswiler <marcel.ziswiler@toradex.com>
-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
diff --git a/board/toradex/apalis-imx8x/Makefile b/board/toradex/apalis-imx8x/Makefile
deleted file mode 100644
index 9d6e85b7429..00000000000
--- a/board/toradex/apalis-imx8x/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2020 Toradex
-#
-
-obj-y += apalis-imx8x.o
diff --git a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg b/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
deleted file mode 100644
index c229706f80a..00000000000
--- a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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
- */
-
-
-/* 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
diff --git a/board/toradex/apalis-imx8x/apalis-imx8x.c b/board/toradex/apalis-imx8x/apalis-imx8x.c
deleted file mode 100644
index ac3bac66a96..00000000000
--- a/board/toradex/apalis-imx8x/apalis-imx8x.c
+++ /dev/null
@@ -1,155 +0,0 @@
-// 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/global_data.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));
-}
-
-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;
-	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(void)
-{
-	/* 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;
-}
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 7cadd05c0a7..0e657a2a0a9 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -13,7 +13,6 @@
 
 #if defined(CONFIG_TARGET_APALIS_IMX6) || \
 	defined(CONFIG_TARGET_APALIS_IMX8) || \
-	defined(CONFIG_TARGET_APALIS_IMX8X) || \
 	defined(CONFIG_TARGET_COLIBRI_IMX6) || \
 	defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
 	defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
@@ -379,7 +378,6 @@ static int get_cfgblock_interactive(void)
 	it = console_buffer[0];
 
 #if defined(CONFIG_TARGET_APALIS_IMX8) || \
-		defined(CONFIG_TARGET_APALIS_IMX8X) || \
 		defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
 		defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
 		defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
@@ -451,16 +449,7 @@ static int get_cfgblock_interactive(void)
 				tdx_hw_tag.prodid = APALIS_IMX8QP;
 		}
 	} else if (is_cpu_type(MXC_CPU_IMX8QXP)) {
-#ifdef CONFIG_TARGET_APALIS_IMX8X
-		if (it == 'y' || it == 'Y' || wb == 'y' || wb == 'Y') {
-				tdx_hw_tag.prodid = APALIS_IMX8QXP_WIFI_BT_IT;
-		} else {
-			if (gd->ram_size == 0x40000000)
-				tdx_hw_tag.prodid = APALIS_IMX8DXP;
-			else
-				tdx_hw_tag.prodid = APALIS_IMX8QXP;
-		}
-#elif CONFIG_TARGET_COLIBRI_IMX8X
+#ifdef CONFIG_TARGET_COLIBRI_IMX8X
 		if (it == 'y' || it == 'Y') {
 			if (wb == 'y' || wb == 'Y')
 				tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT;
diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig
deleted file mode 100644
index b67cdece71c..00000000000
--- a/configs/apalis-imx8x_defconfig
+++ /dev/null
@@ -1,82 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_IMX8=y
-CONFIG_SYS_TEXT_BASE=0x80020000
-CONFIG_SYS_MALLOC_LEN=0x2800000
-CONFIG_SYS_MALLOC_F_LEN=0x4000
-CONFIG_NR_DRAM_BANKS=3
-CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0xFFFFDE00
-CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-apalis"
-CONFIG_TARGET_APALIS_IMX8X=y
-CONFIG_SYS_LOAD_ADDR=0x89000000
-CONFIG_SYS_MEMTEST_START=0x88000000
-CONFIG_SYS_MEMTEST_END=0x89000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_REMAKE_ELF=y
-CONFIG_FIT=y
-CONFIG_OF_SYSTEM_SETUP=y
-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_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_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_USE_ETHPRIME=y
-CONFIG_ETHPRIME="eth0"
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_IP_DEFRAG=y
-CONFIG_TFTP_BLOCKSIZE=4096
-CONFIG_TFTP_TSIZE=y
-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_SUPPORT_EMMC_BOOT=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_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
diff --git a/doc/board/toradex/apalis-imx8x.rst b/doc/board/toradex/apalis-imx8x.rst
deleted file mode 100644
index e62578b1527..00000000000
--- a/doc/board/toradex/apalis-imx8x.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0+
-
-Apalis iMX8X V1.1A Module (SoC NXP i.MX8QXP RevB)
-=================================================
-
-Quick Start
------------
-
-- 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
-
-    $ 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 System Controller firmware
----------------------------------------
-
-.. code-block:: bash
-
-    $ wget https://github.com/toradex/i.MX-System-Controller-Firmware/raw/master/src/scfw_export_mx8qx_b0/build_mx8qx_b0/mx8qx-apalis-scfw-tcm.bin
-
-Get SECO container
----------------------------------------
-
-.. code-block:: bash
-
-    $ 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
-------------
-.. 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 $(builddir)/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}
diff --git a/doc/board/toradex/index.rst b/doc/board/toradex/index.rst
index 1cd926a7303..ead5efbb955 100644
--- a/doc/board/toradex/index.rst
+++ b/doc/board/toradex/index.rst
@@ -7,7 +7,6 @@ Toradex
    :maxdepth: 2
 
    apalis-imx8
-   apalis-imx8x
    colibri_imx7
    colibri-imx8x
    verdin-imx8mm
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
deleted file mode 100644
index 71a80f38bbb..00000000000
--- a/include/configs/apalis-imx8x.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* 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_SYS_FSL_ESDHC_ADDR	0
-#define USDHC1_BASE_ADDR		0x5b010000
-#define USDHC2_BASE_ADDR		0x5b020000
-
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
-
-#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=1\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_SYS_INIT_SP_ADDR		0x80200000
-
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-
-/* 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 */
-
-#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_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 PHY_ANEG_TIMEOUT 20000
-
-#endif /* __APALIS_IMX8X_H */
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 02/11] toradex: globally disable video support
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
  2022-04-13  9:33 ` [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname Marcel Ziswiler
                   ` (8 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Igor Opaniuk, Marcel Ziswiler

From: Igor Opaniuk <igor.opaniuk@toradex.com>

As video support is very specific depending on the exact display
customisation we decided to disable video support for all out modules
by default.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 configs/apalis_imx6_defconfig          | 10 ----------
 configs/colibri-imx6ull-emmc_defconfig |  7 -------
 configs/colibri-imx6ull_defconfig      |  8 --------
 configs/colibri_imx6_defconfig         | 10 ----------
 configs/colibri_imx7_defconfig         |  8 --------
 configs/colibri_imx7_emmc_defconfig    |  7 -------
 configs/colibri_t20_defconfig          |  5 -----
 configs/colibri_vf_defconfig           |  5 -----
 8 files changed, 60 deletions(-)

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 3fa1bb58a43..cdf169df046 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
@@ -106,13 +105,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-# CONFIG_VIDEO_BPP8 is not set
-# CONFIG_VIDEO_BPP32 is not set
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_VIDEO_IPUV3=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index 8811d7749d9..0e7f29b56bc 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -37,7 +37,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_REGULATOR=y
@@ -79,10 +78,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index b75e21799e1..b04f171549b 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -42,7 +42,6 @@ CONFIG_CMD_NAND_TORTURE=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_REGULATOR=y
@@ -95,12 +94,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_VIDEO_MXS=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 04b73a8b9cb..4aecb283332 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -55,7 +55,6 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
@@ -104,13 +103,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-# CONFIG_VIDEO_BPP8 is not set
-# CONFIG_VIDEO_BPP32 is not set
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_VIDEO_IPUV3=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 1ccc7163cfb..f3cd7a4d5ae 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -40,7 +40,6 @@ CONFIG_CMD_NAND_TORTURE=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_BOOTP_PXE is not set
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_HASH is not set
@@ -90,12 +89,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_VIDEO_MXS=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index dcac585ab38..2b97890497c 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -38,7 +38,6 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_HASH is not set
@@ -83,10 +82,4 @@ CONFIG_USB_GADGET_MANUFACTURER="Toradex"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_LOGO=y
-CONFIG_SYS_WHITE_ON_BLACK=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
-CONFIG_BMP_16BPP=y
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index b883fc105f5..00f45dc115f 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -25,7 +25,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -69,8 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-# CONFIG_VIDEO_BPP8 is not set
-CONFIG_VIDEO_TEGRA20=y
-CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 44f370f57d7..cf230508f2b 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -53,7 +53,6 @@ CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
@@ -100,10 +99,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_DM_VIDEO=y
-# CONFIG_VIDEO_BPP8 is not set
-# CONFIG_VIDEO_BPP16 is not set
-CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
  2022-04-13  9:33 ` [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x Marcel Ziswiler
  2022-04-13  9:33 ` [PATCH v2 02/11] toradex: globally disable video support Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 04/11] toradex: drop legacy nfsboot script Marcel Ziswiler
                   ` (7 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Igor Opaniuk, Marcel Ziswiler

From: Igor Opaniuk <igor.opaniuk@toradex.com>

Use the same name of DHCP Distroboot script as in regular eMMC case.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 include/configs/apalis-imx8.h     | 1 +
 include/configs/apalis-tk1.h      | 1 +
 include/configs/apalis_imx6.h     | 1 +
 include/configs/apalis_t30.h      | 3 ++-
 include/configs/colibri-imx6ull.h | 1 +
 include/configs/colibri-imx8x.h   | 1 +
 include/configs/colibri_imx6.h    | 1 +
 include/configs/colibri_imx7.h    | 1 +
 include/configs/colibri_t20.h     | 1 +
 include/configs/colibri_t30.h     | 3 ++-
 include/configs/colibri_vf.h      | 1 +
 include/configs/verdin-imx8mm.h   | 1 +
 12 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index c87bcd475ef..a45a6ffe7c9 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -38,6 +38,7 @@
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttyLP1 earlycon\0" \
 	"fdt_addr=0x83000000\0"	\
 	"fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 59c901994fd..10cfe1e3490 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -71,6 +71,7 @@
 
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"boot_file=zImage\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttyS0\0" \
 	"defargs=lp0_vec=2064@0xf46ff000 core_edp_mv=1150 core_edp_ma=4000 " \
 		"usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0 " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index ea5711dba87..afdcf9b2f60 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -108,6 +108,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off vmalloc=400M\0" \
 	"fdt_file=" FDT_FILE "\0" \
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index b7a2fb695e2..d1d518a5340 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -47,7 +47,8 @@
 		"mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
 #define BOARD_EXTRA_ENV_SETTINGS \
-	UBOOT_UPDATE
+	UBOOT_UPDATE \
+	"boot_script_dhcp=boot.scr\0"
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 281815e0863..fa4f8ce9813 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -101,6 +101,7 @@
 	NFS_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
+	"boot_script_dhcp=boot.scr\0" \
 	"bootubipart=ubi\0" \
 	"console=ttymxc0\0" \
 	"defargs=user_debug=30\0" \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 008fa6ef076..ee070408d41 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -67,6 +67,7 @@
 	M4_BOOT_ENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"consoleargs=console=ttyLP3,${baudrate} earlycon\0" \
 	"fdt_addr=0x83000000\0"	\
 	"fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 0d1a1bcf3df..956b59f692b 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -92,6 +92,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
 	"fdt_file=" FDT_FILE "\0" \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 0382724ae10..ff2c30c7f92 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -140,6 +140,7 @@
 	MODULE_EXTRA_ENV_SETTINGS \
 	UBOOT_UPDATE \
 	"boot_file=zImage\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"bootubipart=ubi\0" \
 	"console=ttymxc0\0" \
 	"defargs=\0" \
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index fdf6bb28419..f6b3ab1b041 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -24,6 +24,7 @@
 
 /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
 #define BOARD_EXTRA_ENV_SETTINGS \
+	"boot_script_dhcp=boot.scr\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
 	UBOOT_UPDATE
 
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index cbe73bf86ba..1ce0def4ddf 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -45,7 +45,8 @@
 		"mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
 #define BOARD_EXTRA_ENV_SETTINGS \
-	UBOOT_UPDATE
+	UBOOT_UPDATE \
+	"boot_script_dhcp=boot.scr\0"
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index c5366722914..dfc023c6bfa 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -71,6 +71,7 @@
 	NFS_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttyLP0\0" \
 	"defargs=user_debug=30\0" \
 	"dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 6c5b190dd95..132edf7b36c 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -52,6 +52,7 @@
 	MEM_LAYOUT_ENV_SETTINGS \
 	"bootcmd_mfg=fastboot 0\0" \
 	"boot_file=Image\0" \
+	"boot_script_dhcp=boot.scr\0" \
 	"console=ttymxc0\0" \
 	"fdt_addr=0x43000000\0" \
 	"fdt_board=dev\0" \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 04/11] toradex: drop legacy nfsboot script
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (2 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 05/11] configs: toradex: enable missing fit options Marcel Ziswiler
                   ` (6 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Igor Opaniuk, Marcel Ziswiler

From: Igor Opaniuk <igor.opaniuk@toradex.com>

Drop legacy nfsboot script in favor of distroboot DHCP boot.

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 include/configs/apalis-imx8.h     |  5 -----
 include/configs/apalis-tk1.h      | 11 -----------
 include/configs/apalis_imx6.h     | 11 -----------
 include/configs/colibri-imx6ull.h | 10 ----------
 include/configs/colibri-imx8x.h   |  6 ------
 include/configs/colibri_imx6.h    | 11 -----------
 include/configs/colibri_imx7.h    | 10 ----------
 include/configs/colibri_vf.h      | 10 ----------
 include/configs/verdin-imx8mm.h   |  6 ------
 include/configs/verdin-imx8mp.h   |  6 ------
 10 files changed, 86 deletions(-)

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index a45a6ffe7c9..a9e0dee3f56 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -50,11 +50,6 @@
 		"root=PARTUUID=${uuid} rootwait " \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 	"mmcpart=1\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-		"\0" \
-	"nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \
-		"apalis-imx8/${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)?; " \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 10cfe1e3490..face78e1dd4 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -59,16 +59,6 @@
 	"update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
 		"mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
-	"nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \
-		"${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-		"run nfsdtbload; dhcp ${kernel_addr_r} " \
-		"&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
-	"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \
-		"${soc}-${fdt_module}-${fdt_board}.dtb " \
-		"&& setenv dtbparam ${fdt_addr_r}\0"
-
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
@@ -80,7 +70,6 @@
 	"fdt_board=eval\0" \
 	"fdt_fixup=;\0" \
 	"fdt_module=" FDT_MODULE "\0" \
-	NFS_BOOTCMD \
 	UBOOT_UPDATE \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
 		"00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index afdcf9b2f60..3a27bbb6c87 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -89,16 +89,6 @@
 	"ramdisk_addr_r=0x12200000\0" \
 	"scriptaddr=0x17000000\0"
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0:on root=/dev/nfs ro\0" \
-	"nfsboot=run setup; " \
-		"setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-		"${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-		"run nfsdtbload; dhcp ${kernel_addr_r} " \
-		"&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-	"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-		"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
 #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 #define FDT_FILE "imx6q-apalis-eval.dtb"
 #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
@@ -115,7 +105,6 @@
 	"fdtfile=" FDT_FILE "\0" \
 	"fdt_fixup=;\0" \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	UBOOT_UPDATE \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
 		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index fa4f8ce9813..11791cee6ac 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -50,15 +50,6 @@
 	"ramdisk_addr_r=0x82200000\0" \
 	"scriptaddr=0x87000000\0"
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
-	"nfsboot=run setup; " \
-		"setenv bootargs ${defargs} ${nfsargs} " \
-		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
-		"dhcp ${kernel_addr_r} && " \
-		"tftp ${fdt_addr_r} ${fdtfile} && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD \
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \
 		"ubi.fm_autoconvert=1\0" \
@@ -98,7 +89,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index ee070408d41..ae5a8ff6a93 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -80,12 +80,6 @@
 		"root=PARTUUID=${uuid} rootwait " \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 	"mmcpart=1\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} " \
-		"colibri-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)?; " \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 956b59f692b..f7e9709e122 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -78,16 +78,6 @@
 	"ramdisk_addr_r=0x12200000\0" \
 	"scriptaddr=0x17000000\0"
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
-	"nfsboot=run setup; " \
-		"setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-		"${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-		"run nfsdtbload; dhcp ${kernel_addr_r} " \
-		"&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-	"nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-		"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
@@ -99,7 +89,6 @@
 	"fdtfile=" FDT_FILE "\0" \
 	"fdt_fixup=;\0" \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	UBOOT_UPDATE \
 	"setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
 		"00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index ff2c30c7f92..3dba7bcef25 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -89,15 +89,6 @@
 	"ramdisk_addr_r=0x82100000\0" \
 	"scriptaddr=0x87000000\0"
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
-	"nfsboot=run setup; " \
-		"setenv bootargs ${defargs} ${nfsargs} " \
-		"${setupargs} ${vidargs}; echo Booting from NFS...;" \
-		"dhcp ${kernel_addr_r} && " \
-		"tftp ${fdt_addr_r} ${soc}-colibri${variant}-${fdt_board}.dtb && " \
-		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD	\
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
 		"ubi.fm_autoconvert=1\0" \
@@ -136,7 +127,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	MODULE_EXTRA_ENV_SETTINGS \
 	UBOOT_UPDATE \
 	"boot_file=zImage\0" \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index dfc023c6bfa..99b0cbb3420 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -35,15 +35,6 @@
 	"update_uboot=nand erase.part u-boot && " \
 		"nand write ${loadaddr} u-boot ${filesize}\0" \
 
-#define NFS_BOOTCMD \
-	"nfsargs=ip=:::::eth0: root=/dev/nfs\0"	\
-	"nfsboot=run setup; " \
-	"setenv bootargs ${defargs} ${nfsargs} ${mtdparts} " \
-	"${setupargs} ${vidargs}; echo Booting from NFS...;" \
-	"dhcp ${kernel_addr_r} && "	\
-	"tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD \
 	"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
 	"ubi.fm_autoconvert=1\0" \
@@ -68,7 +59,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 132edf7b36c..65a01f9fadc 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -58,12 +58,6 @@
 	"fdt_board=dev\0" \
 	"initrd_addr=0x43800000\0" \
 	"initrd_high=0xffffffffffffffff\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-		"\0" \
-	"nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \
-		"tftp ${fdt_addr} verdin/${fdtfile}; " \
-		"booti ${loadaddr} - ${fdt_addr}\0" \
 	"setup=setenv setupargs console=${console},${baudrate} " \
 		"console=tty1 consoleblank=0 earlycon\0" \
 	"update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 9e29dc19033..da95b8bbc23 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -76,12 +76,6 @@
 	"fdt_board=dev\0" \
 	"initrd_addr=0x43800000\0" \
 	"initrd_high=0xffffffffffffffff\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-		"\0" \
-	"nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \
-		"tftp ${fdt_addr} verdin/${fdtfile}; " \
-		"booti ${loadaddr} - ${fdt_addr}\0" \
 	"setup=setenv setupargs console=${console},${baudrate} console=tty1 " \
 		"consoleblank=0 earlycon\0" \
 	"update_uboot=askenv confirm Did you load flash.bin (y/N)?; " \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 05/11] configs: toradex: enable missing fit options
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (3 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 04/11] toradex: drop legacy nfsboot script Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp Marcel Ziswiler
                   ` (5 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Oleksandr Suvorov, Marcel Ziswiler

From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

Add missing support of FIT-images and enable a verbosity for
this feature.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 configs/apalis-imx8_defconfig          | 1 +
 configs/apalis-tk1_defconfig           | 1 +
 configs/apalis_imx6_defconfig          | 1 +
 configs/colibri-imx6ull-emmc_defconfig | 1 +
 configs/colibri-imx6ull_defconfig      | 1 +
 configs/colibri-imx8x_defconfig        | 1 +
 configs/colibri_imx6_defconfig         | 1 +
 configs/colibri_imx7_defconfig         | 2 ++
 configs/colibri_imx7_emmc_defconfig    | 1 +
 configs/verdin-imx8mm_defconfig        | 1 +
 10 files changed, 11 insertions(+)

diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index 19edbbb6978..beb20f6e1c0 100644
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_MEMTEST_END=0x89000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_REMAKE_ELF=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 9645c2f2108..e098b1171ee 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -12,6 +12,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_APALIS_TK1=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="setenv fdtfile ${soc}-${fdt_module}-${fdt_board}.dtb && run distro_bootcmd"
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index cdf169df046..00c9a24a5dd 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -26,6 +26,7 @@ CONFIG_SYS_MEMTEST_START=0x10000000
 CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index 0e7f29b56bc..8c616178670 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index b04f171549b..3ef7a6aa8d5 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x88000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
 CONFIG_USE_PREBOOT=y
diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index 80bc27b1881..0c9d6b64c1b 100644
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_MEMTEST_END=0x89000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_REMAKE_ELF=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 4aecb283332..1c65d8a7fe1 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -25,6 +25,7 @@ CONFIG_SYS_MEMTEST_START=0x10000000
 CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index f3cd7a4d5ae..3fb50a49bd6 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -13,6 +13,8 @@ CONFIG_IMX_HAB=y
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x8c000000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run ubiboot ; echo ; echo ubiboot failed ; run distro_bootcmd;"
 CONFIG_USE_PREBOOT=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index 2b97890497c..e66d94bf7d9 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -15,6 +15,7 @@ CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x8c000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index 94ba1f50fbb..ce567b770ab 100644
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -21,6 +21,7 @@ CONFIG_SYS_MEMTEST_END=0x80000000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
+CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (4 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 05/11] configs: toradex: enable missing fit options Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually Marcel Ziswiler
                   ` (4 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Oleksandr Suvorov, Marcel Ziswiler

From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

For recovery purpose allow booting via SDP over USB as well.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 configs/colibri_imx7_defconfig      | 1 +
 configs/colibri_imx7_emmc_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 3fb50a49bd6..d2051a5f262 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -40,6 +40,7 @@ CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_NAND_TORTURE=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_BOOTP_PXE is not set
 CONFIG_CMD_BOOTCOUNT=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index e66d94bf7d9..d0f6bf3accf 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_BOOTCOUNT=y
 CONFIG_CMD_CACHE=y
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (5 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:27   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 08/11] board: toradex: drop colibri pxa270 support Marcel Ziswiler
                   ` (3 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Philippe Schenker, Marcel Ziswiler

From: Philippe Schenker <philippe.schenker@toradex.com>

In case a customer wants to set fdtfile currently preboot overrides it
always with preboot just before the bootdelay. Use test -n to check
if fdtfile is already set and only set it if nothing got touched manually

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 configs/colibri-imx6ull-emmc_defconfig | 2 +-
 configs/colibri-imx6ull_defconfig      | 2 +-
 configs/colibri_imx7_defconfig         | 2 +-
 configs/colibri_imx7_emmc_defconfig    | 2 +-
 configs/colibri_vf_defconfig           | 2 +-
 configs/verdin-imx8mm_defconfig        | 2 +-
 configs/verdin-imx8mp_defconfig        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index 8c616178670..b22a19b5b0b 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -16,7 +16,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index 3ef7a6aa8d5..2fba7aaae4d 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -18,7 +18,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index d2051a5f262..2f61223c9eb 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -18,7 +18,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run ubiboot ; echo ; echo ubiboot failed ; run distro_bootcmd;"
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index d0f6bf3accf..918585da495 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -18,7 +18,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index cf230508f2b..e140ee0f300 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -21,7 +21,7 @@ CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
 CONFIG_LOGLEVEL=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index ce567b770ab..e6d9f37623c 100644
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -27,7 +27,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile imx8mm-verdin-${variant}-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx8mm-verdin-${variant}-${fdt_board}.dtb"
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig
index 44fcfa1352e..a74033c8ba7 100644
--- a/configs/verdin-imx8mp_defconfig
+++ b/configs/verdin-imx8mp_defconfig
@@ -34,7 +34,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv fdtfile imx8mp-verdin-${variant}-${fdt_board}.dtb"
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx8mp-verdin-${variant}-${fdt_board}.dtb"
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 08/11] board: toradex: drop colibri pxa270 support
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (6 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:27   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo Marcel Ziswiler
                   ` (2 subsequent siblings)
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot
  Cc: Marcel Ziswiler, Bharat Gooty, Denys Drozdov, Patrick Delaunay,
	Rayagonda Kokatanur, Rick Chen, Sean Anderson, Simon Glass,
	Stefan Roese

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

The Colibri PXA270 has been end-of-life since quite a while and would
require more and more maintenance (e.g. DM conversions).

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 arch/arm/Kconfig                              |   6 -
 board/toradex/colibri_pxa270/Kconfig          |  23 ---
 board/toradex/colibri_pxa270/MAINTAINERS      |   6 -
 board/toradex/colibri_pxa270/Makefile         |   7 -
 board/toradex/colibri_pxa270/colibri_pxa270.c | 153 ------------------
 board/toradex/common/tdx-cfg-block.c          |  19 +--
 configs/colibri_pxa270_defconfig              |  57 -------
 include/configs/colibri_pxa270.h              | 151 -----------------
 include/configs/pxa-common.h                  |  27 ----
 9 files changed, 1 insertion(+), 448 deletions(-)
 delete mode 100644 board/toradex/colibri_pxa270/Kconfig
 delete mode 100644 board/toradex/colibri_pxa270/MAINTAINERS
 delete mode 100644 board/toradex/colibri_pxa270/Makefile
 delete mode 100644 board/toradex/colibri_pxa270/colibri_pxa270.c
 delete mode 100644 configs/colibri_pxa270_defconfig
 delete mode 100644 include/configs/colibri_pxa270.h
 delete mode 100644 include/configs/pxa-common.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index efe33a58e1e..ed34fa59bd7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1833,11 +1833,6 @@ config TARGET_TEN64
 	  Support for Traverse Technologies Ten64 board, based
 	  on NXP LS1088A.
 
-config TARGET_COLIBRI_PXA270
-	bool "Support colibri_pxa270"
-	select CPU_PXA27X
-	select GPIO_EXTRA_HEADER
-
 config ARCH_UNIPHIER
 	bool "Socionext UniPhier SoCs"
 	select BOARD_LATE_INIT
@@ -2301,7 +2296,6 @@ source "board/seeed/npi_imx6ull/Kconfig"
 source "board/socionext/developerbox/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
-source "board/toradex/colibri_pxa270/Kconfig"
 source "board/traverse/ten64/Kconfig"
 source "board/variscite/dart_6ul/Kconfig"
 source "board/vscom/baltos/Kconfig"
diff --git a/board/toradex/colibri_pxa270/Kconfig b/board/toradex/colibri_pxa270/Kconfig
deleted file mode 100644
index f646baa3f05..00000000000
--- a/board/toradex/colibri_pxa270/Kconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-if TARGET_COLIBRI_PXA270
-
-config SYS_BOARD
-	default "colibri_pxa270"
-
-config SYS_VENDOR
-	default "toradex"
-
-config SYS_CONFIG_NAME
-	default "colibri_pxa270"
-
-config TDX_CFG_BLOCK
-	default y
-
-config TDX_HAVE_NOR
-	default y
-
-config TDX_CFG_BLOCK_OFFSET
-	default "262144"
-
-source "board/toradex/common/Kconfig"
-
-endif
diff --git a/board/toradex/colibri_pxa270/MAINTAINERS b/board/toradex/colibri_pxa270/MAINTAINERS
deleted file mode 100644
index b378d7be5a4..00000000000
--- a/board/toradex/colibri_pxa270/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-COLIBRI_PXA270 BOARD
-M:	Marek Vasut <marek.vasut@gmail.com>
-S:	Maintained
-F:	board/toradex/colibri_pxa270/
-F:	include/configs/colibri_pxa270.h
-F:	configs/colibri_pxa270_defconfig
diff --git a/board/toradex/colibri_pxa270/Makefile b/board/toradex/colibri_pxa270/Makefile
deleted file mode 100644
index ea610cfea92..00000000000
--- a/board/toradex/colibri_pxa270/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Toradex Colibri PXA270 Support
-#
-# Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
-
-obj-y	:= colibri_pxa270.o
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
deleted file mode 100644
index 25fbf412095..00000000000
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ /dev/null
@@ -1,153 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Toradex Colibri PXA270 Support
- *
- * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- * Copyright (C) 2016-2019 Marcel Ziswiler <marcel.ziswiler@toradex.com>
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <dm.h>
-#include <init.h>
-#include <net.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/pxa.h>
-#include <asm/arch/regs-mmc.h>
-#include <asm/arch/regs-uart.h>
-#include <asm/global_data.h>
-#include <asm/io.h>
-#include <dm/platdata.h>
-#include <dm/platform_data/pxa_mmc_gen.h>
-#include <dm/platform_data/serial_pxa.h>
-#include <netdev.h>
-#include <serial.h>
-#include <usb.h>
-#include <asm/mach-types.h>
-#include <linux/delay.h>
-#include "../common/tdx-common.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_init(void)
-{
-	/* We have RAM, disable cache */
-	dcache_disable();
-	icache_disable();
-
-	/* arch number of Toradex Colibri PXA270 */
-	gd->bd->bi_arch_number = MACH_TYPE_COLIBRI;
-
-	/* address of boot parameters */
-	gd->bd->bi_boot_params = 0xa0000100;
-
-	return 0;
-}
-
-int checkboard(void)
-{
-	puts("Model: Toradex Colibri PXA270\n");
-
-	return 0;
-}
-
-#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 dram_init(void)
-{
-	pxa2xx_dram_init();
-	gd->ram_size = PHYS_SDRAM_1_SIZE;
-	return 0;
-}
-
-#ifdef	CONFIG_CMD_USB
-int board_usb_init(int index, enum usb_init_type init)
-{
-	writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
-		~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
-		UHCHR);
-
-	writel(readl(UHCHR) | UHCHR_FSBIR, UHCHR);
-
-	while (UHCHR & UHCHR_FSBIR)
-		;
-
-	writel(readl(UHCHR) & ~UHCHR_SSE, UHCHR);
-	writel((UHCHIE_UPRIE | UHCHIE_RWIE), UHCHIE);
-
-	/* Clear any OTG Pin Hold */
-	if (readl(PSSR) & PSSR_OTGPH)
-		writel(readl(PSSR) | PSSR_OTGPH, PSSR);
-
-	writel(readl(UHCRHDA) & ~(0x200), UHCRHDA);
-	writel(readl(UHCRHDA) | 0x100, UHCRHDA);
-
-	/* Set port power control mask bits, only 3 ports. */
-	writel(readl(UHCRHDB) | (0x7 << 17), UHCRHDB);
-
-	/* enable port 2 */
-	writel(readl(UP2OCR) | UP2OCR_HXOE | UP2OCR_HXS |
-		UP2OCR_DMPDE | UP2OCR_DPPDE, UP2OCR);
-
-	return 0;
-}
-
-int board_usb_cleanup(int index, enum usb_init_type init)
-{
-	return 0;
-}
-
-void usb_board_stop(void)
-{
-	writel(readl(UHCHR) | UHCHR_FHR, UHCHR);
-	udelay(11);
-	writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR);
-
-	writel(readl(UHCCOMS) | 1, UHCCOMS);
-	udelay(10);
-
-	writel(readl(CKEN) & ~CKEN10_USBHOST, CKEN);
-}
-#endif
-
-#ifdef CONFIG_DRIVER_DM9000
-int board_eth_init(struct bd_info *bis)
-{
-	return dm9000_initialize(bis);
-}
-#endif
-
-#ifdef	CONFIG_CMD_MMC
-#if !CONFIG_IS_ENABLED(DM_MMC)
-int board_mmc_init(struct bd_info *bis)
-{
-	pxa_mmc_register(0);
-	return 0;
-}
-#else /* !CONFIG_IS_ENABLED(DM_MMC) */
-static const struct pxa_mmc_plat mmc_plat = {
-	.base = (struct pxa_mmc_regs *)MMC0_BASE,
-};
-
-U_BOOT_DRVINFO(pxa_mmcs) = {
-	.name = "pxa_mmc",
-	.plat = &mmc_plat,
-};
-#endif /* !CONFIG_IS_ENABLED(DM_MMC) */
-#endif
-
-static const struct pxa_serial_plat serial_plat = {
-	.base = (struct pxa_uart_regs *)FFUART_BASE,
-	.port = FFUART_INDEX,
-	.baudrate = CONFIG_BAUDRATE,
-};
-
-U_BOOT_DRVINFO(pxa_serials) = {
-	.name = "serial_pxa",
-	.plat = &serial_plat,
-};
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 0e657a2a0a9..9c87289ae93 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -22,11 +22,6 @@
 #else
 #define is_cpu_type(cpu) (0)
 #endif
-#if defined(CONFIG_CPU_PXA27X)
-#include <asm/arch-pxa/pxa.h>
-#else
-#define cpu_is_pxa27x(cpu) (0)
-#endif
 #include <cli.h>
 #include <console.h>
 #include <env.h>
@@ -369,10 +364,7 @@ static int get_cfgblock_interactive(void)
 	/* Unknown module by default */
 	tdx_hw_tag.prodid = 0;
 
-	if (cpu_is_pxa27x())
-		sprintf(message, "Is the module the 312 MHz version? [y/N] ");
-	else
-		sprintf(message, "Is the module an IT version? [y/N] ");
+	sprintf(message, "Is the module an IT version? [y/N] ");
 
 	len = cli_readline(message);
 	it = console_buffer[0];
@@ -500,11 +492,6 @@ static int get_cfgblock_interactive(void)
 				tdx_hw_tag.prodid = COLIBRI_T20_256MB;
 			else
 				tdx_hw_tag.prodid = COLIBRI_T20_512MB;
-	} else if (cpu_is_pxa27x()) {
-		if (it == 'y' || it == 'Y')
-			tdx_hw_tag.prodid = COLIBRI_PXA270_312MHZ;
-		else
-			tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ;
 	}
 #if defined(CONFIG_TARGET_APALIS_T30) || defined(CONFIG_TARGET_COLIBRI_T30)
 	else if (!strcmp("tegra30", soc)) {
@@ -552,10 +539,6 @@ static int get_cfgblock_interactive(void)
 	tdx_hw_tag.ver_minor = console_buffer[2] - '0';
 	tdx_hw_tag.ver_assembly = console_buffer[3] - 'A';
 
-	if (cpu_is_pxa27x() && tdx_hw_tag.ver_major == 1)
-		tdx_hw_tag.prodid -= (COLIBRI_PXA270_312MHZ -
-				       COLIBRI_PXA270_V1_312MHZ);
-
 	while (len < 8) {
 		sprintf(message, "Enter module serial number: ");
 		len = cli_readline(message);
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
deleted file mode 100644
index 9ce65861046..00000000000
--- a/configs/colibri_pxa270_defconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-CONFIG_ARM=y
-CONFIG_SYS_DCACHE_OFF=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_TARGET_COLIBRI_PXA270=y
-CONFIG_SYS_TEXT_BASE=0x0
-CONFIG_SYS_MALLOC_LEN=0x20000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x40000
-CONFIG_ENV_SECT_SIZE=0x40000
-CONFIG_SYS_LOAD_ADDR=0xa0000000
-CONFIG_ENV_ADDR=0x80000
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_HAS_BOARD_SIZE_LIMIT=y
-CONFIG_BOARD_SIZE_LIMIT=262144
-CONFIG_TIMESTAMP=y
-CONFIG_SYS_MONITOR_BASE=0x00000000
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200"
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="if fatload mmc 0 0xa0000000 uImage; then bootm 0xa0000000; fi; if usb reset && fatload usb 0 0xa0000000 uImage; then bootm 0xa0000000; fi; bootm 0xc0000;"
-CONFIG_SYS_DEVICE_NULLDEV=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-# CONFIG_CMDLINE_EDITING is not set
-# CONFIG_AUTO_COMPLETE is not set
-# CONFIG_SYS_LONGHELP is not set
-CONFIG_SYS_PROMPT="$ "
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_EXPORTENV is not set
-# CONFIG_CMD_IMPORTENV is not set
-CONFIG_CMD_DM=y
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_BOOTP_BOOTFILESIZE=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_DM=y
-CONFIG_PXA_MMC_GENERIC=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_DM_SERIAL=y
-CONFIG_PXA_SERIAL=y
-CONFIG_USB=y
-# CONFIG_REGEX is not set
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
deleted file mode 100644
index a5ba916279a..00000000000
--- a/include/configs/colibri_pxa270.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Toradex Colibri PXA270 configuration file
- *
- * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- * Copyright (C) 2015-2016 Marcel Ziswiler <marcel@ziswiler.com>
- */
-
-#ifndef	__CONFIG_H
-#define	__CONFIG_H
-
-/*
- * High Level Board Configuration Options
- */
-
-/*
- * Environment settings
- */
-
-/*
- * Serial Console Configuration
- */
-
-/*
- * Bootloader Components Configuration
- */
-
-/* I2C support */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
-#define CONFIG_SYS_I2C_PXA
-#define CONFIG_PXA_STD_I2C
-#define CONFIG_PXA_PWR_I2C
-#endif
-
-/* LCD support */
-#ifdef CONFIG_LCD
-#define CONFIG_PXA_LCD
-#define CONFIG_PXA_VGA
-#endif
-
-/*
- * Networking Configuration
- */
-#ifdef	CONFIG_CMD_NET
-
-#define	CONFIG_DRIVER_DM9000		1
-#define CONFIG_DM9000_BASE		0x08000000
-#define DM9000_IO			(CONFIG_DM9000_BASE)
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 4)
-#endif
-
-/*
- * Clock Configuration
- */
-#define	CONFIG_SYS_CPUSPEED		0x290		/* 520MHz */
-
-/*
- * DRAM Map
- */
-#define	PHYS_SDRAM_1			0xa0000000	/* SDRAM Bank #1 */
-#define	PHYS_SDRAM_1_SIZE		0x04000000	/* 64 MB */
-
-#define	CONFIG_SYS_DRAM_BASE		0xa0000000	/* CS0 */
-#define	CONFIG_SYS_DRAM_SIZE		0x04000000	/* 64 MB DRAM */
-
-#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define	CONFIG_SYS_INIT_SP_ADDR		0x5c010000
-
-/*
- * NOR FLASH
- */
-#ifdef	CONFIG_CMD_FLASH
-#define	PHYS_FLASH_1			0x00000000	/* Flash Bank #1 */
-#define	PHYS_FLASH_SIZE			0x02000000	/* 32 MB */
-#define	CONFIG_SYS_FLASH_BASE		PHYS_FLASH_1
-
-#define	CONFIG_SYS_FLASH_CFI_WIDTH      FLASH_CFI_32BIT
-
-#define	CONFIG_SYS_MAX_FLASH_SECT	(4 + 255)
-
-#define	CONFIG_SYS_FLASH_ERASE_TOUT	(25 * CONFIG_SYS_HZ)
-#define	CONFIG_SYS_FLASH_WRITE_TOUT	(25 * CONFIG_SYS_HZ)
-#define	CONFIG_SYS_FLASH_LOCK_TOUT	(25 * CONFIG_SYS_HZ)
-#define	CONFIG_SYS_FLASH_UNLOCK_TOUT	(25 * CONFIG_SYS_HZ)
-#endif
-
-#define	CONFIG_SYS_MONITOR_LEN		0x40000
-
-/* Skip factory configuration block */
-
-/*
- * GPIO settings
- */
-#define	CONFIG_SYS_GPSR0_VAL	0x00000000
-#define	CONFIG_SYS_GPSR1_VAL	0x00020000
-#define	CONFIG_SYS_GPSR2_VAL	0x0002c000
-#define	CONFIG_SYS_GPSR3_VAL	0x00000000
-
-#define	CONFIG_SYS_GPCR0_VAL	0x00000000
-#define	CONFIG_SYS_GPCR1_VAL	0x00000000
-#define	CONFIG_SYS_GPCR2_VAL	0x00000000
-#define	CONFIG_SYS_GPCR3_VAL	0x00000000
-
-#define	CONFIG_SYS_GPDR0_VAL	0xc8008000
-#define	CONFIG_SYS_GPDR1_VAL	0xfc02a981
-#define	CONFIG_SYS_GPDR2_VAL	0x92c3ffff
-#define	CONFIG_SYS_GPDR3_VAL	0x0061e804
-
-#define	CONFIG_SYS_GAFR0_L_VAL	0x80100000
-#define	CONFIG_SYS_GAFR0_U_VAL	0xa5c00010
-#define	CONFIG_SYS_GAFR1_L_VAL	0x6992901a
-#define	CONFIG_SYS_GAFR1_U_VAL	0xaaa50008
-#define	CONFIG_SYS_GAFR2_L_VAL	0xaaaaaaaa
-#define	CONFIG_SYS_GAFR2_U_VAL	0x4109a002
-#define	CONFIG_SYS_GAFR3_L_VAL	0x54000310
-#define	CONFIG_SYS_GAFR3_U_VAL	0x00005401
-
-#define	CONFIG_SYS_PSSR_VAL	0x30
-
-/*
- * Clock settings
- */
-#define	CONFIG_SYS_CKEN		0x00500240
-#define	CONFIG_SYS_CCCR		0x02000290
-
-/*
- * Memory settings
- */
-#define	CONFIG_SYS_MSC0_VAL	0x9ee1c5f2
-#define	CONFIG_SYS_MSC1_VAL	0x9ee1f994
-#define	CONFIG_SYS_MSC2_VAL	0x9ee19ee1
-#define	CONFIG_SYS_MDCNFG_VAL	0x090009c9
-#define	CONFIG_SYS_MDREFR_VAL	0x2003a031
-#define	CONFIG_SYS_MDMRS_VAL	0x00220022
-#define	CONFIG_SYS_FLYCNFG_VAL	0x00010001
-#define	CONFIG_SYS_SXCNFG_VAL	0x40044004
-
-/*
- * PCMCIA and CF Interfaces
- */
-#define	CONFIG_SYS_MECR_VAL	0x00000000
-#define	CONFIG_SYS_MCMEM0_VAL	0x00028307
-#define	CONFIG_SYS_MCMEM1_VAL	0x00014307
-#define	CONFIG_SYS_MCATT0_VAL	0x00038787
-#define	CONFIG_SYS_MCATT1_VAL	0x0001c787
-#define	CONFIG_SYS_MCIO0_VAL	0x0002830f
-#define	CONFIG_SYS_MCIO1_VAL	0x0001430f
-
-#include "pxa-common.h"
-
-#endif /* __CONFIG_H */
diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
deleted file mode 100644
index 7a78f98eb15..00000000000
--- a/include/configs/pxa-common.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Toradex Colibri PXA270 configuration file
- *
- * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#ifndef	__CONFIG_PXA_COMMON_H__
-#define	__CONFIG_PXA_COMMON_H__
-
-/*
- * OHCI USB
- */
-#ifdef	CONFIG_CMD_USB
-#define	CONFIG_USB_OHCI_NEW
-#define	CONFIG_SYS_USB_OHCI_CPU_INIT
-#define	CONFIG_SYS_USB_OHCI_BOARD_INIT
-#ifdef CONFIG_CPU_PXA27X
-#define	CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	3
-#else
-#define	CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
-#endif
-#define	CONFIG_SYS_USB_OHCI_REGS_BASE		0x4c000000
-#define	CONFIG_SYS_USB_OHCI_SLOT_NAME		"pxa-ohci"
-#endif
-
-#endif	/* __CONFIG_PXA_COMMON_H__ */
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (7 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 08/11] board: toradex: drop colibri pxa270 support Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:26   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support Marcel Ziswiler
  2022-04-13  9:33 ` [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well Marcel Ziswiler
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Marcel Ziswiler

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

This fixes the following crash when run on a Colibri iMX7S aka solo:

Colibri iMX7 # usb start
starting USB...
Bus usb@30b10000: USB EHCI 1.00
Bus usb@30b20000:

The i.MX 7Solo has only one single USB OTG1 but no USB host port. Trying
to initialize the nonexisting port just crashes.

While at it also drop board_usb_phy_mode() which is also no longer used
in the driver model age.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

(no changes since v1)

 board/toradex/colibri_imx7/colibri_imx7.c | 40 +++++------------------
 configs/colibri_imx7_defconfig            |  1 +
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 6822102d2c3..486299b5e93 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -319,40 +319,16 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 #endif
 
 #ifdef CONFIG_USB_EHCI_MX7
-static iomux_v3_cfg_t const usb_otg2_pads[] = {
-	MX7D_PAD_UART3_CTS_B__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-int board_ehci_hcd_init(int port)
+int board_fix_fdt(void *rw_fdt_blob)
 {
-	switch (port) {
-	case 0:
-		break;
-	case 1:
-		if (is_cpu_type(MXC_CPU_MX7S))
-			return -ENODEV;
-
-		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
-						 ARRAY_SIZE(usb_otg2_pads));
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
+	/* i.MX 7Solo has only one single USB OTG1 but no USB host port */
+	if (is_cpu_type(MXC_CPU_MX7S)) {
+		int offset = fdt_path_offset(rw_fdt_blob, "/soc/bus@30800000/usb@30b20000");
 
-int board_usb_phy_mode(int port)
-{
-	switch (port) {
-	case 0:
-		if (gpio_get_value(USB_CDET_GPIO))
-			return USB_INIT_DEVICE;
-		else
-			return USB_INIT_HOST;
-	case 1:
-	default:
-		return USB_INIT_HOST;
+		return fdt_status_disabled(rw_fdt_blob, offset);
 	}
+
+	return 0;
 }
 
 #if defined(CONFIG_BOARD_LATE_INIT)
@@ -373,4 +349,4 @@ int board_late_init(void)
 }
 #endif /* CONFIG_BOARD_LATE_INIT */
 
-#endif
+#endif /* CONFIG_USB_EHCI_MX7 */
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 2f61223c9eb..0e254fd7d15 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -10,6 +10,7 @@ CONFIG_TARGET_COLIBRI_IMX7=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
+CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0x8c000000
 CONFIG_DISTRO_DEFAULTS=y
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (8 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:25   ` sbabic
  2022-04-13  9:33 ` [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well Marcel Ziswiler
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Marcel Ziswiler

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Drop optional support for the ancient Apalis iMX6 V1.0 hardware which
had the UART wired as DCE rather than DTE.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v2:
- Also drop setup_dcemode_uart() and setup_iomux_dce_uart() which are
  now unused.

 board/toradex/apalis_imx6/apalis_imx6.c | 38 ++-----------------------
 include/configs/apalis_imx6.h           |  6 +---
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index a78d52d3fac..5604c4646cf 100644
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -304,13 +304,6 @@ static void setup_dtemode_uart(void)
 	clrbits_le32((u32 *)(UART4_BASE + UCR3), UCR3_DCD | UCR3_RI);
 	clrbits_le32((u32 *)(UART5_BASE + UCR3), UCR3_DCD | UCR3_RI);
 }
-static void setup_dcemode_uart(void)
-{
-	clrbits_le32((u32 *)(UART1_BASE + UFCR), UFCR_DCEDTE);
-	clrbits_le32((u32 *)(UART2_BASE + UFCR), UFCR_DCEDTE);
-	clrbits_le32((u32 *)(UART4_BASE + UFCR), UFCR_DCEDTE);
-	clrbits_le32((u32 *)(UART5_BASE + UFCR), UFCR_DCEDTE);
-}
 
 static void setup_iomux_dte_uart(void)
 {
@@ -318,12 +311,6 @@ static void setup_iomux_dte_uart(void)
 	imx_iomux_v3_setup_multiple_pads(uart1_pads_dte,
 					 ARRAY_SIZE(uart1_pads_dte));
 }
-static void setup_iomux_dce_uart(void)
-{
-	setup_dcemode_uart();
-	imx_iomux_v3_setup_multiple_pads(uart1_pads_dce,
-					 ARRAY_SIZE(uart1_pads_dce));
-}
 
 #ifdef CONFIG_USB_EHCI_MX6
 int board_ehci_hcd_init(int port)
@@ -665,11 +652,8 @@ int board_early_init_f(void)
 {
 	imx_iomux_v3_setup_multiple_pads(pwr_intb_pads,
 					 ARRAY_SIZE(pwr_intb_pads));
-#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 	setup_iomux_dte_uart();
-#else
-	setup_iomux_dce_uart();
-#endif
+
 	return 0;
 }
 
@@ -714,23 +698,7 @@ int board_late_init(void)
 	rev = get_board_revision();
 	snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev);
 	env_set("board_rev", env_str);
-
-#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
-	if ((rev & 0xfff0) == 0x0100) {
-		char *fdt_env;
-
-		/* reconfigure the UART to DCE mode dynamically if on V1.0 HW */
-		setup_iomux_dce_uart();
-
-		/* if using the default device tree, use version for V1.0 HW */
-		fdt_env = env_get("fdt_file");
-		if ((fdt_env != NULL) && (strcmp(FDT_FILE, fdt_env) == 0)) {
-			env_set("fdt_file", FDT_FILE_V1_0);
-			printf("patching fdt_file to " FDT_FILE_V1_0 "\n");
-		}
-	}
-#endif /* CONFIG_TDX_APALIS_IMX6_V1_0 */
-#endif /* CONFIG_REVISION_TAG */
+#endif /* CONFIG_BOARD_LATE_INIT */
 
 #ifdef CONFIG_CMD_USB_SDP
 	if (is_boot_from_usb()) {
@@ -1129,10 +1097,8 @@ void board_init_f(ulong dummy)
 	/* UART clocks enabled and gd valid - init serial console */
 	preloader_console_init();
 
-#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 	/* Make sure we use dte mode */
 	setup_dtemode_uart();
-#endif
 
 	/* DDR initialization */
 	spl_dram_init();
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 3a27bbb6c87..57fd3ce12d0 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -89,12 +89,8 @@
 	"ramdisk_addr_r=0x12200000\0" \
 	"scriptaddr=0x17000000\0"
 
-#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 #define FDT_FILE "imx6q-apalis-eval.dtb"
-#define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
-#else
-#define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
-#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well
  2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
                   ` (9 preceding siblings ...)
  2022-04-13  9:33 ` [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support Marcel Ziswiler
@ 2022-04-13  9:33 ` Marcel Ziswiler
  2022-04-21 12:27   ` sbabic
  10 siblings, 1 reply; 23+ messages in thread
From: Marcel Ziswiler @ 2022-04-13  9:33 UTC (permalink / raw)
  To: u-boot; +Cc: Marcel Ziswiler

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Use PREBOOT as well. This allows a customer to just set fdt_board as
on any other module to customize the device tree for his carrier
board.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v2:
- Re-based on top of Stefano's imx/master-next which dropped 13 commits
  already applied.

 configs/apalis_imx6_defconfig  | 2 ++
 configs/colibri_imx6_defconfig | 2 ++
 include/configs/apalis_imx6.h  | 5 +----
 include/configs/colibri_imx6.h | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 00c9a24a5dd..ea4ad276e7f 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -29,6 +29,8 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6q-apalis-${fdt_board}.dtb"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 1c65d8a7fe1..4f38d5cb483 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -28,6 +28,8 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6dl-colibri-${fdt_board}.dtb"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 57fd3ce12d0..aa93d10f852 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -89,16 +89,13 @@
 	"ramdisk_addr_r=0x12200000\0" \
 	"scriptaddr=0x17000000\0"
 
-#define FDT_FILE "imx6q-apalis-eval.dtb"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off vmalloc=400M\0" \
-	"fdt_file=" FDT_FILE "\0" \
-	"fdtfile=" FDT_FILE "\0" \
+	"fdt_board=eval\0" \
 	"fdt_fixup=;\0" \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBOOT_UPDATE \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index f7e9709e122..9ca6bef192f 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -78,15 +78,13 @@
 	"ramdisk_addr_r=0x12200000\0" \
 	"scriptaddr=0x17000000\0"
 
-#define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
-	"fdt_file=" FDT_FILE "\0" \
-	"fdtfile=" FDT_FILE "\0" \
+	"fdt_board=eval-v3\0" \
 	"fdt_fixup=;\0" \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBOOT_UPDATE \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x
  2022-04-13  9:33 ` [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x Marcel Ziswiler
@ 2022-04-21 12:25   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:25 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Denys Drozdov <denys.drozdov@toradex.com>
> Drop Apalis iMX8X platform as it never left sample state and is no
> longer supported.
> Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support
  2022-04-13  9:33 ` [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support Marcel Ziswiler
@ 2022-04-21 12:25   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:25 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Drop optional support for the ancient Apalis iMX6 V1.0 hardware which
> had the UART wired as DCE rather than DTE.
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 02/11] toradex: globally disable video support
  2022-04-13  9:33 ` [PATCH v2 02/11] toradex: globally disable video support Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> As video support is very specific depending on the exact display
> customisation we decided to disable video support for all out modules
> by default.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname
  2022-04-13  9:33 ` [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Use the same name of DHCP Distroboot script as in regular eMMC case.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp
  2022-04-13  9:33 ` [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> For recovery purpose allow booting via SDP over USB as well.
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 05/11] configs: toradex: enable missing fit options
  2022-04-13  9:33 ` [PATCH v2 05/11] configs: toradex: enable missing fit options Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Add missing support of FIT-images and enable a verbosity for
> this feature.
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 04/11] toradex: drop legacy nfsboot script
  2022-04-13  9:33 ` [PATCH v2 04/11] toradex: drop legacy nfsboot script Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Drop legacy nfsboot script in favor of distroboot DHCP boot.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo
  2022-04-13  9:33 ` [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo Marcel Ziswiler
@ 2022-04-21 12:26   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:26 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> This fixes the following crash when run on a Colibri iMX7S aka solo:
> Colibri iMX7 # usb start
> starting USB...
> Bus usb@30b10000: USB EHCI 1.00
> Bus usb@30b20000:
> The i.MX 7Solo has only one single USB OTG1 but no USB host port. Trying
> to initialize the nonexisting port just crashes.
> While at it also drop board_usb_phy_mode() which is also no longer used
> in the driver model age.
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually
  2022-04-13  9:33 ` [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually Marcel Ziswiler
@ 2022-04-21 12:27   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:27 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Philippe Schenker <philippe.schenker@toradex.com>
> In case a customer wants to set fdtfile currently preboot overrides it
> always with preboot just before the bootdelay. Use test -n to check
> if fdtfile is already set and only set it if nothing got touched manually
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well
  2022-04-13  9:33 ` [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well Marcel Ziswiler
@ 2022-04-21 12:27   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:27 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Use PREBOOT as well. This allows a customer to just set fdt_board as
> on any other module to customize the device tree for his carrier
> board.
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH v2 08/11] board: toradex: drop colibri pxa270 support
  2022-04-13  9:33 ` [PATCH v2 08/11] board: toradex: drop colibri pxa270 support Marcel Ziswiler
@ 2022-04-21 12:27   ` sbabic
  0 siblings, 0 replies; 23+ messages in thread
From: sbabic @ 2022-04-21 12:27 UTC (permalink / raw)
  To: Marcel Ziswiler, u-boot

> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> The Colibri PXA270 has been end-of-life since quite a while and would
> require more and more maintenance (e.g. DM conversions).
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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@denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2022-04-21 12:31 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-13  9:33 [PATCH v2 00/11] toradex updates: assortment of fixes and improvements Marcel Ziswiler
2022-04-13  9:33 ` [PATCH v2 01/11] toradex: apalis-imx8x: drop support for apalis imx8x Marcel Ziswiler
2022-04-21 12:25   ` sbabic
2022-04-13  9:33 ` [PATCH v2 02/11] toradex: globally disable video support Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 03/11] toradex: set default dhcp distroboot scriptname Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 04/11] toradex: drop legacy nfsboot script Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 05/11] configs: toradex: enable missing fit options Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 06/11] configs: colibri-imx7/-emmc: enable booting from usb sdp Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 07/11] configs: tdx: Do not overwrite fdtfile if it got set manually Marcel Ziswiler
2022-04-21 12:27   ` sbabic
2022-04-13  9:33 ` [PATCH v2 08/11] board: toradex: drop colibri pxa270 support Marcel Ziswiler
2022-04-21 12:27   ` sbabic
2022-04-13  9:33 ` [PATCH v2 09/11] board: colibri_imx7: fix usb start on solo Marcel Ziswiler
2022-04-21 12:26   ` sbabic
2022-04-13  9:33 ` [PATCH v2 10/11] configs: tdx: apalis_imx6: drop hw v1.0 support Marcel Ziswiler
2022-04-21 12:25   ` sbabic
2022-04-13  9:33 ` [PATCH v2 11/11] configs: tdx: apalis/colibri_imx6: use preboot as well Marcel Ziswiler
2022-04-21 12:27   ` sbabic

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.