Skip to contentSkip to conversation

toradex updates: assortment of fixes and improvements

PATCH Superseded Marcel Ziswiler 3 participants 42 messages Apr 8, 2022 – Apr 13, 2022

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover toradex updates: assortment of fixes and improvements

From: Marcel Ziswiler <[email protected]>

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.

Denys Drozdov (3):
toradex: apalis-imx8x: drop support for apalis imx8x
apalis-imx6: avoid save environment unasked
apalis-tk1: avoid save environment unasked

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

Marcel Ziswiler (9):
arm64: dts: imx8mm-u-boot.dtsi: imx8mp-u-boot.dtsi: use atf-bl31 type
configs: verdin-imx8mm: verdin-imx8mp: enable dm serial
board: toradex: drop colibri pxa270 support
colibri-imx6ull: fix nand bch geometry
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
configs: colibri-imx6ull/-emmc: use micrel ksz8xxx phy driver
board: colibri-imx6ull: fix detecting sd card

Oleksandr Suvorov (3):
colibri-imx6ull: drop vidargs and remove video= settings
configs: toradex: enable missing fit options
configs: colibri-imx7/-emmc: enable booting from usb sdp

Oleksii Bidnichenko (1):
disk: part: add the device search failed log msg

Philippe Schenker (5):
include: colibri_vf: add missing tdxargs variable
board: colibri-imx6ull: Do not leave variant variable unset
configs: tdx: Do not overwrite fdtfile if it got set manually
regulator: fixed: add possibility to enable by clock
board: colibri-imx6ull: fix detecting ethernet phy

 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/dts/imx6ull-colibri.dts              |   1 +
 arch/arm/dts/imx6ull-colibri.dtsi             |  34 ++-
 arch/arm/dts/imx8mm-u-boot.dtsi               |   2 +-
 arch/arm/dts/imx8mp-u-boot.dtsi               |   3 +-
 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-tk1/apalis-tk1.c         |   3 -
 board/toradex/apalis_imx6/apalis_imx6.c       |  28 +-
 .../toradex/colibri-imx6ull/colibri-imx6ull.c |  27 +-
 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                |  80 -----
 configs/apalis-tk1_defconfig                  |   1 +
 configs/apalis_imx6_defconfig                 |  13 +-
 configs/colibri-imx6ull-emmc_defconfig        |  11 +-
 configs/colibri-imx6ull_defconfig             |  12 +-
 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              |  52 ----
 configs/colibri_t20_defconfig                 |   5 -
 configs/colibri_vf_defconfig                  |   8 +-
 configs/verdin-imx8mm_defconfig               |   4 +-
 configs/verdin-imx8mp_defconfig               |   3 +-
 disk/part.c                                   |   2 +
 doc/board/toradex/apalis-imx8x.rst            |  77 -----
 doc/board/toradex/index.rst                   |   1 -
 drivers/power/regulator/fixed.c               |  60 +++-
 include/configs/apalis-imx8.h                 |   6 +-
 include/configs/apalis-imx8x.h                | 129 --------
 include/configs/apalis-tk1.h                  |  12 +-
 include/configs/apalis_imx6.h                 |  21 +-
 include/configs/apalis_t30.h                  |   3 +-
 include/configs/colibri-imx6ull.h             |  15 +-
 include/configs/colibri-imx8x.h               |   7 +-
 include/configs/colibri_imx6.h                |  16 +-
 include/configs/colibri_imx7.h                |  11 +-
 include/configs/colibri_pxa270.h              | 158 ----------
 include/configs/colibri_t20.h                 |   1 +
 include/configs/colibri_t30.h                 |   3 +-
 include/configs/colibri_vf.h                  |  13 +-
 include/configs/pxa-common.h                  |  27 --
 include/configs/verdin-imx8mm.h               |   7 +-
 include/configs/verdin-imx8mp.h               |   6 -
 58 files changed, 161 insertions(+), 1659 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
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/24 arm64: dts: imx8mm-u-boot.dtsi: imx8mp-u-boot.dtsi: use atf-bl31 type

From: Marcel Ziswiler <[email protected]>

Explicitly use the atf-bl31 type for the bl31.bin atf-blob. This uses the path from the BL31 environment variable, if defined.

---

 arch/arm/dts/imx8mm-u-boot.dtsi | 2 +-
 arch/arm/dts/imx8mp-u-boot.dtsi | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/dts/imx8mm-u-boot.dtsi +1 -1
index 3ea03a96d6d..9f66cdb65a9 100644
@@ -109,7 +109,7 @@
 
 					atf-blob {
 						filename = "bl31.bin";
-						type = "blob-ext";
+						type = "atf-bl31";
 					};
 				};
 
arch/arm/dts/imx8mp-u-boot.dtsi +2 -1
index 120c4c4dbb1..cfc352ae34a 100644
@@ -123,8 +123,9 @@
 					load = <0x970000>;
 					entry = <0x970000>;
 
-					atf_blob: blob-ext {
+					atf_blob: atf-blob {
 						filename = "bl31.bin";
+						type = "atf-bl31";
 					};
 				};
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 1/24 arm64: dts: imx8mm-u-boot.dtsi: imx8mp-u-boot.dtsi: use atf-bl31 type

Quoted 4 lines

From: Marcel Ziswiler <[email protected]> Explicitly use the atf-bl31 type for the bl31.bin atf-blob. This uses the path from the BL31 environment variable, if defined.

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

Best regards,
Stefano Babic

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

PATCH 2/24 configs: verdin-imx8mm: verdin-imx8mp: enable dm serial

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Enable driver model for serial.

---

 configs/verdin-imx8mm_defconfig | 1 +
 configs/verdin-imx8mp_defconfig | 1 +
 2 files changed, 2 insertions(+)
configs/verdin-imx8mm_defconfig +1 -0
index f2da12e92f6..7a81ae6d374 100644
@@ -97,6 +97,7 @@ CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
configs/verdin-imx8mp_defconfig +1 -0
index 4c28f7f55e4..35cc4afd3f5 100644
@@ -120,6 +120,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SPL_POWER_I2C=y
+CONFIG_DM_SERIAL=y
 CONFIG_MXC_UART=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
Signature · 1 line
2.34.1
#4 lore raw

PATCH 2/24 configs: verdin-imx8mm: verdin-imx8mp: enable dm serial

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Enable driver model for serial.

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

Best regards,
Stefano Babic

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

PATCH 3/24 toradex: apalis-imx8x: drop support for apalis imx8x

In reply to Marcel Ziswiler

From: Denys Drozdov <[email protected]>

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

---

 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                |  80 -----
 doc/board/toradex/apalis-imx8x.rst            |  77 -----
 doc/board/toradex/index.rst                   |   1 -
 include/configs/apalis-imx8x.h                | 129 --------
 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
arch/arm/dts/Makefile +0 -1
index 960f1a9fd4d..f5733e9e413 100644
@@ -889,7 +889,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
arch/arm/dts/fsl-imx8qxp-apalis-u-boot.dtsi deleted +0 -139

139 lines not on this page · raw message

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

278 lines not on this page · raw message

arch/arm/mach-imx/imx8/Kconfig +0 -6
index b43739e5c64..3bb354ed16c 100644
@@ -53,11 +53,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
@@ -98,7 +93,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
board/toradex/apalis-imx8x/Kconfig deleted +0 -33
deleted file mode 100644
index d6cda7e3ff0..00000000000
@@ -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
board/toradex/apalis-imx8x/MAINTAINERS deleted +0 -10
deleted file mode 100644
index 93d6cdd4742..00000000000
@@ -1,10 +0,0 @@
-Apalis iMX8X
-M:	Marcel Ziswiler <[email protected]>
-W:	http://developer.toradex.com/software/linux/linux-software
-S:	Maintained
-F:	arch/arm/dts/fsl-imx8x-apalis.dts
-F:	arch/arm/dts/fsl-imx8x-apalis-u-boot.dtsi
-F:	board/toradex/apalis-imx8x/
-F:	configs/apalis-imx8x_defconfig
-F:	doc/board/toradex/apalis-imx8x.rst
-F:	include/configs/apalis-imx8x.h
board/toradex/apalis-imx8x/Makefile deleted +0 -6
deleted file mode 100644
index 9d6e85b7429..00000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2020 Toradex
-#
-
-obj-y += apalis-imx8x.o
board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg deleted +0 -23
deleted file mode 100644
index c229706f80a..00000000000
@@ -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
board/toradex/apalis-imx8x/apalis-imx8x.c deleted +0 -155

155 lines not on this page · raw message

board/toradex/common/tdx-cfg-block.c +1 -12
index 7cadd05c0a7..0e657a2a0a9 100644
@@ -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;
configs/apalis-imx8x_defconfig deleted +0 -80

80 lines not on this page · raw message

doc/board/toradex/apalis-imx8x.rst deleted +0 -77

77 lines not on this page · raw message

doc/board/toradex/index.rst +0 -1
index 1cd926a7303..ead5efbb955 100644
@@ -7,7 +7,6 @@ Toradex
    :maxdepth: 2
 
    apalis-imx8
-   apalis-imx8x
    colibri_imx7
    colibri-imx8x
    verdin-imx8mm
include/configs/apalis-imx8x.h deleted +0 -129

129 lines not on this page · raw message

Signature · 1 line
2.34.1
#6 lore raw

PATCH 4/24 toradex: globally disable video support

In reply to Marcel Ziswiler

From: Igor Opaniuk <[email protected]>

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

---

 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           |  6 ------
 8 files changed, 61 deletions(-)
configs/apalis_imx6_defconfig +0 -10
index bd71e4c32aa..382092294e3 100644
@@ -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
configs/colibri-imx6ull-emmc_defconfig +0 -7
index e7dba8ec6d1..3483fa6fc45 100644
@@ -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
@@ -78,10 +77,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
configs/colibri-imx6ull_defconfig +0 -8
index 2b9d318f709..de35fbcabf6 100644
@@ -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
@@ -94,12 +93,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
configs/colibri_imx6_defconfig +0 -10
index 43c3b04e312..03f2f88688b 100644
@@ -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
configs/colibri_imx7_defconfig +0 -8
index 52518128e6c..0d9d4caa966 100644
@@ -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
configs/colibri_imx7_emmc_defconfig +0 -7
index e22278a7bcf..25848a35635 100644
@@ -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
configs/colibri_t20_defconfig +0 -5
index b883fc105f5..00f45dc115f 100644
@@ -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
configs/colibri_vf_defconfig +0 -6
index 8cf8a31beb0..335e21c010f 100644
@@ -51,7 +51,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
@@ -98,11 +97,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_VIDEO_FSL_DCU_FB=y
-CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set
Signature · 1 line
2.34.1
#7 lore raw

PATCH 5/24 toradex: set default dhcp distroboot scriptname

In reply to Marcel Ziswiler

From: Igor Opaniuk <[email protected]>

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

---

 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(-)
include/configs/apalis-imx8.h +1 -0
index c87bcd475ef..a45a6ffe7c9 100644
@@ -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" \
include/configs/apalis-tk1.h +1 -0
index 57192649ecc..a961812313d 100644
@@ -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 " \
include/configs/apalis_imx6.h +1 -0
index bbdcab29d8f..ce7a08ea371 100644
@@ -109,6 +109,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" \
include/configs/apalis_t30.h +2 -1
index eab4f22be34..33f2a3be2a0 100644
@@ -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-usb-gadget.h"
 #include "tegra-common-post.h"
include/configs/colibri-imx6ull.h +1 -0
index 91f0f953a12..009c4d6f692 100644
@@ -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" \
include/configs/colibri-imx8x.h +1 -0
index 008fa6ef076..ee070408d41 100644
@@ -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" \
include/configs/colibri_imx6.h +1 -0
index 1dbc77dde1c..ead88bb42d2 100644
@@ -93,6 +93,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" \
include/configs/colibri_imx7.h +1 -0
index 92e24ea8c61..1f608c67d01 100644
@@ -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" \
include/configs/colibri_t20.h +1 -0
index c377187b803..3752581a27b 100644
@@ -27,6 +27,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
 
include/configs/colibri_t30.h +2 -1
index 324e607839a..ca8ddf26f80 100644
@@ -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-usb-gadget.h"
 #include "tegra-common-post.h"
include/configs/colibri_vf.h +1 -0
index 62f85185b76..164c0e71d20 100644
@@ -82,6 +82,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" \
include/configs/verdin-imx8mm.h +1 -0
index 17583c0a6af..c734c5c0c88 100644
@@ -53,6 +53,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" \
Signature · 1 line
2.34.1
#8 lore raw

PATCH 6/24 toradex: drop legacy nfsboot script

In reply to Marcel Ziswiler

From: Igor Opaniuk <[email protected]>

Drop legacy nfsboot script in favor of distroboot DHCP boot.

---

 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(-)
include/configs/apalis-imx8.h +0 -5
index a45a6ffe7c9..a9e0dee3f56 100644
@@ -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)?; " \
include/configs/apalis-tk1.h +0 -11
index a961812313d..178a219e7cd 100644
@@ -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} " \
include/configs/apalis_imx6.h +0 -11
index ce7a08ea371..9a611b163ab 100644
@@ -90,16 +90,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"
@@ -116,7 +106,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} " \
include/configs/colibri-imx6ull.h +0 -10
index 009c4d6f692..654b246b80f 100644
@@ -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" \
include/configs/colibri-imx8x.h +0 -6
index ee070408d41..ae5a8ff6a93 100644
@@ -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)?; " \
include/configs/colibri_imx6.h +0 -11
index ead88bb42d2..ff3f3636ede 100644
@@ -79,16 +79,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 \
@@ -100,7 +90,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} " \
include/configs/colibri_imx7.h +0 -10
index 1f608c67d01..276667bb945 100644
@@ -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" \
include/configs/colibri_vf.h +0 -10
index 164c0e71d20..68a2f3f3a3d 100644
@@ -46,15 +46,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" \
@@ -79,7 +70,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
-	NFS_BOOTCMD \
 	UBI_BOOTCMD \
 	UBOOT_UPDATE \
 	"boot_script_dhcp=boot.scr\0" \
include/configs/verdin-imx8mm.h +0 -6
index c734c5c0c88..a53f43d9236 100644
@@ -59,12 +59,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)?; " \
include/configs/verdin-imx8mp.h +0 -6
index f8b4bf2df9b..5d0df0ac67a 100644
@@ -84,12 +84,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)?; " \
Signature · 1 line
2.34.1
#9 lore raw

PATCH 7/24 include: colibri_vf: add missing tdxargs variable

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

All the other NAND-based boards have tdxargs specified for setting manual kernel command-line arguments.

---

 include/configs/colibri_vf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/colibri_vf.h +1 -1
index 68a2f3f3a3d..22ba7f44e61 100644
@@ -51,7 +51,7 @@
 	"ubi.fm_autoconvert=1\0" \
 	"ubiboot=run setup; " \
 	"setenv bootargs ${defargs} ${ubiargs} ${mtdparts} "   \
-	"${setupargs} ${vidargs}; echo Booting from NAND...; " \
+	"${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \
 	"ubi part ubi && " \
 	"ubi read ${kernel_addr_r} kernel && " \
 	"ubi read ${fdt_addr_r} dtb && " \
Signature · 1 line
2.34.1
#10 lore raw

PATCH 7/24 include: colibri_vf: add missing tdxargs variable

Quoted 5 lines

From: Philippe Schenker <[email protected]> All the other NAND-based boards have tdxargs specified for setting manual kernel command-line arguments.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#11 lore raw

PATCH 8/24 colibri-imx6ull: drop vidargs and remove video= settings

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

Since we envision using overlays for display interfaces, the video= settings within vidargs are obsolete. Remove these settings from the U-Boot.

---

 include/configs/colibri-imx6ull.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/configs/colibri-imx6ull.h +1 -3
index 654b246b80f..12bc41db5e3 100644
@@ -114,9 +114,7 @@
 		"${board}/flash_blk.img && source ${loadaddr}\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \
-	"vidargs=video=mxsfb:640x480M-16@60"
-
+	"videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0"
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
Signature · 1 line
2.34.1
#12 lore raw

PATCH 8/24 colibri-imx6ull: drop vidargs and remove video= settings

Quoted 6 lines

From: Oleksandr Suvorov <[email protected]> Since we envision using overlays for display interfaces, the video= settings within vidargs are obsolete. Remove these settings from the U-Boot.

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

Best regards,
Stefano Babic

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

PATCH 9/24 configs: toradex: enable missing fit options

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

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

---

 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(+)
configs/apalis-imx8_defconfig +1 -0
index 43215faeb93..3ad539c4f2f 100644
@@ -15,6 +15,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_REMAKE_ELF=y
 CONFIG_SYS_LOAD_ADDR=0x80280000
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/apalis-tk1_defconfig +1 -0
index 9645c2f2108..e098b1171ee 100644
@@ -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"
configs/apalis_imx6_defconfig +1 -0
index 382092294e3..86216b6e034 100644
@@ -26,6 +26,7 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 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
configs/colibri-imx6ull-emmc_defconfig +1 -0
index 3483fa6fc45..5b64682d066 100644
@@ -13,6 +13,7 @@ CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc"
 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"
configs/colibri-imx6ull_defconfig +1 -0
index de35fbcabf6..764bce1de89 100644
@@ -14,6 +14,7 @@ CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
 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
configs/colibri-imx8x_defconfig +1 -0
index 04f7f5b0fde..645ddcef536 100644
@@ -15,6 +15,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_REMAKE_ELF=y
 CONFIG_SYS_LOAD_ADDR=0x80280000
 CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/colibri_imx6_defconfig +1 -0
index 03f2f88688b..fed1ece5709 100644
@@ -25,6 +25,7 @@ CONFIG_SPL=y
 CONFIG_CMD_HDMIDETECT=y
 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
configs/colibri_imx7_defconfig +2 -0
index 0d9d4caa966..2db2fbc86ca 100644
@@ -13,6 +13,8 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 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
configs/colibri_imx7_emmc_defconfig +1 -0
index 25848a35635..b369c1dc319 100644
@@ -15,6 +15,7 @@ CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 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"
configs/verdin-imx8mm_defconfig +1 -0
index 7a81ae6d374..78c4eaa1f34 100644
@@ -22,6 +22,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_LOAD_ADDR=0x40480000
 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
Signature · 1 line
2.34.1
#14 lore raw

PATCH 10/24 configs: colibri-imx7/-emmc: enable booting from usb sdp

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

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

---

 configs/colibri_imx7_defconfig      | 1 +
 configs/colibri_imx7_emmc_defconfig | 1 +
 2 files changed, 2 insertions(+)
configs/colibri_imx7_defconfig +1 -0
index 2db2fbc86ca..d81b30fc454 100644
@@ -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
configs/colibri_imx7_emmc_defconfig +1 -0
index b369c1dc319..465333f91ea 100644
@@ -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
Signature · 1 line
2.34.1
#15 lore raw

PATCH 11/24 apalis-imx6: avoid save environment unasked

In reply to Marcel Ziswiler

From: Denys Drozdov <[email protected]>

U-Boot should never save the environment unasked.
This also avoids storing broken ftd_file to eMMC.

---

 board/toradex/apalis_imx6/apalis_imx6.c | 3 ---
 1 file changed, 3 deletions(-)
board/toradex/apalis_imx6/apalis_imx6.c +0 -3
index 25a4cd9f38b..a78d52d3fac 100644
@@ -727,9 +727,6 @@ int board_late_init(void)
 		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");
-#ifndef CONFIG_ENV_IS_NOWHERE
-			env_save();
-#endif
 		}
 	}
 #endif /* CONFIG_TDX_APALIS_IMX6_V1_0 */
Signature · 1 line
2.34.1
#16 lore raw

PATCH 11/24 apalis-imx6: avoid save environment unasked

Quoted 5 lines

From: Denys Drozdov <[email protected]> U-Boot should never save the environment unasked. This also avoids storing broken ftd_file to eMMC.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#17 lore raw

PATCH 12/24 apalis-tk1: avoid save environment unasked

In reply to Marcel Ziswiler

From: Denys Drozdov <[email protected]>

U-Boot should never save the environment unasked. This also avoids storing broken fdt_module to flash.

---

 board/toradex/apalis-tk1/apalis-tk1.c | 3 ---
 1 file changed, 3 deletions(-)
board/toradex/apalis-tk1/apalis-tk1.c +0 -3
index 2769b546010..ccf665b2118 100644
@@ -71,9 +71,6 @@ int arch_misc_init(void)
 			env_set("fdt_module", FDT_MODULE_V1_0);
 			printf("patching fdt_module to " FDT_MODULE_V1_0
 			       " for older V1.0 and V1.1 HW\n");
-#ifndef CONFIG_ENV_IS_NOWHERE
-			env_save();
-#endif
 		}
 
 		/* activate USB power enable GPIOs */
Signature · 1 line
2.34.1
#18 lore raw

PATCH 12/24 apalis-tk1: avoid save environment unasked

Quoted 5 lines

From: Denys Drozdov <[email protected]> U-Boot should never save the environment unasked. This also avoids storing broken fdt_module to flash.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#19 lore raw

PATCH 13/24 board: colibri-imx6ull: Do not leave variant variable unset

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

Toradex uses the variable variant to distinguish between modules with eMMC, NAND with wifi and NAND without wifi.
This variable is set on every boot. Set this variable also if we have a NAND module without wifi to prevent issues.

---

 board/toradex/colibri-imx6ull/colibri-imx6ull.c | 4 ++++
 1 file changed, 4 insertions(+)
board/toradex/colibri-imx6ull/colibri-imx6ull.c +4 -0
index 02ab5889b9a..3244184f272 100644
@@ -172,10 +172,14 @@ int board_late_init(void)
 	} else {
 		if (is_emmc)
 			env_set("variant", "-emmc");
+		else
+			env_set("variant", "");
 	}
 #else
 	if (is_emmc)
 		env_set("variant", "-emmc");
+	else
+		env_set("variant", "");
 #endif
 
 	/*
Signature · 1 line
2.34.1
#20 lore raw

PATCH 13/24 board: colibri-imx6ull: Do not leave variant variable unset

Quoted 7 lines

From: Philippe Schenker <[email protected]> Toradex uses the variable variant to distinguish between modules with eMMC, NAND with wifi and NAND without wifi.
This variable is set on every boot. Set this variable also if we have a NAND module without wifi to prevent issues.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#21 lore raw

PATCH 14/24 configs: tdx: Do not overwrite fdtfile if it got set manually

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

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

---

 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(-)
configs/colibri-imx6ull-emmc_defconfig +1 -1
index 5b64682d066..cd88320b605 100644
@@ -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
configs/colibri-imx6ull_defconfig +1 -1
index 764bce1de89..d06cc2f7d82 100644
@@ -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
configs/colibri_imx7_defconfig +1 -1
index d81b30fc454..c00d1938eec 100644
@@ -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
configs/colibri_imx7_emmc_defconfig +1 -1
index 465333f91ea..73054449613 100644
@@ -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
configs/colibri_vf_defconfig +1 -1
index 335e21c010f..caa9ab0aab4 100644
@@ -19,7 +19,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
configs/verdin-imx8mm_defconfig +1 -1
index 78c4eaa1f34..aa89738b44a 100644
@@ -28,7 +28,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
configs/verdin-imx8mp_defconfig +1 -1
index 35cc4afd3f5..50729d0be6d 100644
@@ -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
Signature · 1 line
2.34.1
#22 lore raw

PATCH 15/24 regulator: fixed: add possibility to enable by clock

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

This commit adds the possibility to choose the compatible "regulator-fixed-clock" in devicetree.

This is a special case of regulator-fixed where a clock has to be used to switch the regulator on and off.

---

 drivers/power/regulator/fixed.c | 60 ++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)
drivers/power/regulator/fixed.c +59 -1
index d3e0fb672d9..90004d1601a 100644
@@ -6,14 +6,21 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <errno.h>
 #include <dm.h>
+#include <linux/delay.h>
 #include <log.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
 #include "regulator_common.h"
 
+struct fixed_clock_regulator_plat {
+	struct clk *enable_clock;
+	unsigned int clk_enable_counter;
+};
+
 static int fixed_regulator_of_to_plat(struct udevice *dev)
 {
 	struct dm_regulator_uclass_plat *uc_pdata;
@@ -71,6 +78,38 @@ static int fixed_regulator_set_enable(struct udevice *dev, bool enable)
 	return regulator_common_set_enable(dev, dev_get_plat(dev), enable);
 }
 
+static int fixed_clock_regulator_get_enable(struct udevice *dev)
+{
+	struct fixed_clock_regulator_plat *priv = dev_get_priv(dev);
+
+	return priv->clk_enable_counter > 0;
+}
+
+static int fixed_clock_regulator_set_enable(struct udevice *dev, bool enable)
+{
+	struct fixed_clock_regulator_plat *priv = dev_get_priv(dev);
+	struct regulator_common_plat *dev_pdata = dev_get_plat(dev);
+	int ret = 0;
+
+	if (enable) {
+		ret = clk_enable(priv->enable_clock);
+		priv->clk_enable_counter++;
+	} else {
+		ret = clk_disable(priv->enable_clock);
+		priv->clk_enable_counter--;
+	}
+	if (ret)
+		return ret;
+
+	if (enable && dev_pdata->startup_delay_us)
+		udelay(dev_pdata->startup_delay_us);
+
+	if (!enable && dev_pdata->off_on_delay_us)
+		udelay(dev_pdata->off_on_delay_us);
+
+	return ret;
+}
+
 static const struct dm_regulator_ops fixed_regulator_ops = {
 	.get_value	= fixed_regulator_get_value,
 	.get_current	= fixed_regulator_get_current,
@@ -78,16 +117,35 @@ static const struct dm_regulator_ops fixed_regulator_ops = {
 	.set_enable	= fixed_regulator_set_enable,
 };
 
+static const struct dm_regulator_ops fixed_clock_regulator_ops = {
+	.get_enable	= fixed_clock_regulator_get_enable,
+	.set_enable	= fixed_clock_regulator_set_enable,
+};
+
 static const struct udevice_id fixed_regulator_ids[] = {
 	{ .compatible = "regulator-fixed" },
 	{ },
 };
 
+static const struct udevice_id fixed_clock_regulator_ids[] = {
+	{ .compatible = "regulator-fixed-clock" },
+	{ },
+};
+
 U_BOOT_DRIVER(regulator_fixed) = {
 	.name = "regulator_fixed",
 	.id = UCLASS_REGULATOR,
 	.ops = &fixed_regulator_ops,
 	.of_match = fixed_regulator_ids,
 	.of_to_plat = fixed_regulator_of_to_plat,
-	.plat_auto	= sizeof(struct regulator_common_plat),
+	.plat_auto = sizeof(struct regulator_common_plat),
+};
+
+U_BOOT_DRIVER(regulator_fixed_clock) = {
+	.name = "regulator_fixed_clk",
+	.id = UCLASS_REGULATOR,
+	.ops = &fixed_clock_regulator_ops,
+	.of_match = fixed_clock_regulator_ids,
+	.of_to_plat = fixed_regulator_of_to_plat,
+	.plat_auto = sizeof(struct fixed_clock_regulator_plat),
 };
Signature · 1 line
2.34.1
#23 lore raw

PATCH 15/24 regulator: fixed: add possibility to enable by clock

Quoted 7 lines

From: Philippe Schenker <[email protected]> This commit adds the possibility to choose the compatible "regulator-fixed-clock" in devicetree.
This is a special case of regulator-fixed where a clock has to be used to switch the regulator on and off.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#24 lore raw

PATCH 16/24 board: colibri-imx6ull: fix detecting ethernet phy

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

Now that it is possible to use regulator-fixed-clock make use of it. This makes U-Boot detect the PHY on first cold-boot.

This commit also adjusts the code in setup_fec and follows how it is done in mx6ullevk.c

This commit also slows down the boot-process by about 150ms as it now waits for the regulator-fixed-clock voltage that drives the PHY to go up.
If you rely on very fast boot-speeds and don't need ethernet for your boot-process you can safely revert the changes on imx6ull-colibri.dtsi

---

 arch/arm/dts/imx6ull-colibri.dtsi             | 13 +++++++++++
 .../toradex/colibri-imx6ull/colibri-imx6ull.c | 23 +++++++------------
 2 files changed, 21 insertions(+), 15 deletions(-)
arch/arm/dts/imx6ull-colibri.dtsi +13 -0
index 1fa9d10412e..cbf037be7eb 100644
@@ -58,6 +58,18 @@
 		gpio = <&gpio1 2 GPIO_ACTIVE_LOW>; /* USBH_PEN */
 		vin-supply = <&reg_5v0>;
 	};
+
+	reg_eth_phy: regulator-eth-phy {
+		compatible = "regulator-fixed-clock";
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-name = "eth_phy";
+		regulator-type = "voltage";
+		vin-supply = <&reg_module_3v3>;
+		clocks = <&clks IMX6UL_CLK_ENET2_REF_125M>;
+		startup-delay-us = <150000>;
+	};
 };
 
 &adc1 {
@@ -78,6 +90,7 @@
 	pinctrl-0 = <&pinctrl_enet2>;
 	phy-mode = "rmii";
 	phy-handle = <&ethphy1>;
+	phy-supply = <&reg_eth_phy>;
 	status = "okay";
 
 	mdio {
board/toradex/colibri-imx6ull/colibri-imx6ull.c +8 -15
index 3244184f272..ba4e0df2c27 100644
@@ -100,28 +100,21 @@ static int setup_fec(void)
 	struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
 	int ret;
 
-	/* provide the PHY clock from the i.MX 6 */
+	/*
+	 * Use 50MHz anatop loopback REF_CLK2 for ENET2,
+	 * clear gpr1[14], set gpr1[18].
+	 */
+	clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
+			IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
+
 	ret = enable_fec_anatop_clock(1, ENET_50MHZ);
 	if (ret)
 		return ret;
 
-	/* Use 50M anatop REF_CLK and output it on ENET2_TX_CLK */
-	clrsetbits_le32(&iomuxc_regs->gpr[1],
-			IOMUX_GPR1_FEC2_CLOCK_MUX2_SEL_MASK,
-			IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
-
-	/* give new Ethernet PHY power save mode circuitry time to settle */
-	mdelay(300);
+	enable_enet_clk(1);
 
 	return 0;
 }
-
-int board_phy_config(struct phy_device *phydev)
-{
-	if (phydev->drv->config)
-		phydev->drv->config(phydev);
-	return 0;
-}
 #endif /* CONFIG_FEC_MXC */
 
 int board_init(void)
Signature · 1 line
2.34.1
#25 lore raw

PATCH 16/24 board: colibri-imx6ull: fix detecting ethernet phy

Quoted 11 lines

From: Philippe Schenker <[email protected]> Now that it is possible to use regulator-fixed-clock make use of it. This makes U-Boot detect the PHY on first cold-boot. This commit also adjusts the code in setup_fec and follows how it is done in mx6ullevk.c
This commit also slows down the boot-process by about 150ms as it now waits for the regulator-fixed-clock voltage that drives the PHY to go up.
If you rely on very fast boot-speeds and don't need ethernet for your boot-process you can safely revert the changes on imx6ull-colibri.dtsi

Quoted 2 lines

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#26 lore raw

PATCH 17/24 board: toradex: drop colibri pxa270 support

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

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

---

 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              |  52 ------
 include/configs/colibri_pxa270.h              | 158 ------------------
 include/configs/pxa-common.h                  |  27 ---
 9 files changed, 1 insertion(+), 450 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
arch/arm/Kconfig +0 -6
index 80533943896..0166705e573 100644
@@ -1792,11 +1792,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
@@ -2240,7 +2235,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"
board/toradex/colibri_pxa270/Kconfig deleted +0 -23
deleted file mode 100644
index f646baa3f05..00000000000
@@ -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
board/toradex/colibri_pxa270/MAINTAINERS deleted +0 -6
deleted file mode 100644
index b378d7be5a4..00000000000
@@ -1,6 +0,0 @@
-COLIBRI_PXA270 BOARD
-M:	Marek Vasut <[email protected]>
-S:	Maintained
-F:	board/toradex/colibri_pxa270/
-F:	include/configs/colibri_pxa270.h
-F:	configs/colibri_pxa270_defconfig
board/toradex/colibri_pxa270/Makefile deleted +0 -7
deleted file mode 100644
index ea610cfea92..00000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Toradex Colibri PXA270 Support
-#
-# Copyright (C) 2010 Marek Vasut <[email protected]>
-
-obj-y	:= colibri_pxa270.o
board/toradex/colibri_pxa270/colibri_pxa270.c deleted +0 -153

153 lines not on this page · raw message

board/toradex/common/tdx-cfg-block.c +1 -18
index 0e657a2a0a9..9c87289ae93 100644
@@ -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);
configs/colibri_pxa270_defconfig deleted +0 -52

52 lines not on this page · raw message

include/configs/colibri_pxa270.h deleted +0 -158

158 lines not on this page · raw message

include/configs/pxa-common.h deleted +0 -27
deleted file mode 100644
index 7a78f98eb15..00000000000
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Toradex Colibri PXA270 configuration file
- *
- * Copyright (C) 2010 Marek Vasut <[email protected]>
- */
-
-#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__ */
Signature · 1 line
2.34.1
#27 lore raw

PATCH 18/24 disk: part: add the device search failed log msg

In reply to Marcel Ziswiler

From: Oleksii Bidnichenko <[email protected]>

Add missing error message to blk_get_device_part_str.

---

 disk/part.c | 2 ++
 1 file changed, 2 insertions(+)
disk/part.c +2 -0
index 49e39a24e86..16e8c94eebc 100644
@@ -527,6 +527,8 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
 	/* Look up the device */
 	dev = blk_get_device_by_str(ifname, dev_str, dev_desc);
 	if (dev < 0) {
+		printf("** Bad device specification %s %s **\n",
+		       ifname, dev_str);
 		ret = dev;
 		goto cleanup;
 	}
Signature · 1 line
2.34.1
#28 lore raw

PATCH 18/24 disk: part: add the device search failed log msg

Quoted 4 lines

From: Oleksii Bidnichenko <[email protected]> Add missing error message to blk_get_device_part_str.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#29 lore raw

PATCH 19/24 colibri-imx6ull: fix nand bch geometry

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix NAND BCH geometry as otherwise the following errors are observed upon boot:

...
Loading Environment from NAND... NAND read from offset 380000 failed -74
...
NAND read from offset 800 failed -74
...
ubi0 error: ubi_io_read: error -74 (ECC error) while reading 64 bytes
from PEB 0:0, read 64 bytes
...

Fixes ed48490f8d3f

("mtd: gpmi: fix the bch setting backward compatible issue")

---

 arch/arm/dts/imx6ull-colibri.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6ull-colibri.dts +1 -0
index dbe3e0206e5..d59696ee6e7 100644
@@ -15,6 +15,7 @@
 &gpmi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpmi_nand>;
+	fsl,use-minimum-ecc;
 	nand-on-flash-bbt;
 	nand-ecc-mode = "hw";
 	nand-ecc-strength = <8>;
Signature · 1 line
2.34.1
#30 lore raw

Re: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry

Quoted 11 lines

Subject: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry
Date: Fri, 8 Apr 2022 10:07:14 +0200
Message-Id: <[email protected]>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <[email protected]>
References: <[email protected]>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Result: 250
(mbox) Adding cc: Marcel Ziswiler <[email protected]> from line 'From: Marcel Ziswiler

<[email protected]>'

Quoted 1 line

(body) Adding cc: Marcel Ziswiler <[email protected]> from line 'Signed-off-by: Marcel Ziswiler

<[email protected]>'

Quoted 1 line

(cc-cmd) Adding cc: Marcel Ziswiler <[email protected]> from: 'tools/patman/patman send --cc-cmd

/tmp/patman.341838'

Quoted 3 lines

(cc-cmd) Adding cc: [email protected] from: 'tools/patman/patman send --cc-cmd /tmp/patman.341838' Requested action aborted
Mails per session limit exceeded.

Hehe, looks like I hit some arbitrary email limit somewhere. Let me figure out how I may send the last 5 patches...

#31 lore raw

Re: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry

Hi Marcel,

Quoted 14 lines · Marcel Ziswiler
Quoted 11 lines

Subject: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry
Date: Fri, 8 Apr 2022 10:07:14 +0200
Message-Id: <[email protected]>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <[email protected]>
References: <[email protected]>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Result: 250
(mbox) Adding cc: Marcel Ziswiler <[email protected]> from line 'From: Marcel Ziswiler

<[email protected]>'

Quoted 1 line

(body) Adding cc: Marcel Ziswiler <[email protected]> from line 'Signed-off-by: Marcel Ziswiler

<[email protected]>'

Quoted 8 lines
Quoted 1 line

(cc-cmd) Adding cc: Marcel Ziswiler <[email protected]> from: 'tools/patman/patman send --cc-cmd

/tmp/patman.341838'

Quoted 3 lines

(cc-cmd) Adding cc: [email protected] from: 'tools/patman/patman send --cc-cmd /tmp/patman.341838' Requested action aborted
Mails per session limit exceeded.

Hehe, looks like I hit some arbitrary email limit somewhere. Let me figure out how I may send the last 5 patches...

Well, I tried to reduce the number...for next time ! ;-)

I have applied just a few (quite orthogonal) of them, but due to other patches I merged I get conflicts. Could you rebase on top of u-boot-imx and then repost ? Thanks !

Best regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#32 lore raw

Re: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry

Hi Stefano

Quoted 20 lines · Stefano Babic

Hi Marcel,

Quoted 17 lines · Marcel Ziswiler
Quoted 11 lines

Subject: [PATCH v1 19/24] colibri-imx6ull: fix nand bch geometry
Date: Fri,  8 Apr 2022 10:07:14 +0200
Message-Id: <[email protected]>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <[email protected]>
References: <[email protected]>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Result: 250
(mbox) Adding cc: Marcel Ziswiler <[email protected]> from line 'From: Marcel Ziswiler

<[email protected]>'

Quoted 1 line

(body) Adding cc: Marcel Ziswiler <[email protected]> from line 'Signed-off-by: Marcel Ziswiler

<[email protected]>'

Quoted 2 lines

(cc-cmd) Adding cc: Marcel Ziswiler <[email protected]> from: 'tools/patman/patman send --cc- cmd

/tmp/patman.341838'

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

(cc-cmd) Adding cc: [email protected] from: 'tools/patman/patman send --cc-cmd /tmp/patman.341838' Requested action aborted
Mails per session limit exceeded.

Hehe, looks like I hit some arbitrary email limit somewhere. Let me figure out how I may send the last 5 patches...

Well, I tried to reduce the number...for next time ! ;-)

Thanks! Yeah, 50 % applied, not too bad (;-p).

Quoted 3 lines

I have applied just a few (quite orthogonal) of them, but due to other patches I merged I get conflicts. Could you rebase on top of u-boot-imx and then repost ? Thanks !

Okay, yeah. I just noticed that now. Sure, let me rebase/repost, no biggy.

And thanks for picking up on it again!

Quoted 2 lines

Best regards,
Stefano

Cheers

Marcel

#33 lore raw

PATCH 19/24 colibri-imx6ull: fix nand bch geometry

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix NAND BCH geometry as otherwise the following errors are observed upon boot:

...
Loading Environment from NAND... NAND read from offset 380000 failed -74
...
NAND read from offset 800 failed -74
...
ubi0 error: ubi_io_read: error -74 (ECC error) while reading 64 bytes
from PEB 0:0, read 64 bytes
...

Fixes ed48490f8d3f

("mtd: gpmi: fix the bch setting backward compatible issue")

---

 arch/arm/dts/imx6ull-colibri.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/imx6ull-colibri.dts +1 -0
index dbe3e0206e5..d59696ee6e7 100644
@@ -15,6 +15,7 @@
 &gpmi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpmi_nand>;
+	fsl,use-minimum-ecc;
 	nand-on-flash-bbt;
 	nand-ecc-mode = "hw";
 	nand-ecc-strength = <8>;
Signature · 1 line
2.34.1
#34 lore raw

PATCH 19/24 colibri-imx6ull: fix nand bch geometry

Quoted 11 lines

From: Marcel Ziswiler <[email protected]>
Fix NAND BCH geometry as otherwise the following errors are observed upon boot:
...
Loading Environment from NAND... NAND read from offset 380000 failed -74
...
NAND read from offset 800 failed -74
...
ubi0 error: ubi_io_read: error -74 (ECC error) while reading 64 bytes
from PEB 0:0, read 64 bytes
...

Quoted 3 lines
Fixes ed48490f8d3f

("mtd: gpmi: fix the bch setting backward compatible issue")

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#35 lore raw

PATCH 20/24 board: colibri_imx7: fix usb start on solo

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

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.

---

 board/toradex/colibri_imx7/colibri_imx7.c | 40 +++++------------------
 configs/colibri_imx7_defconfig            |  1 +
 2 files changed, 9 insertions(+), 32 deletions(-)
board/toradex/colibri_imx7/colibri_imx7.c +8 -32
index 6822102d2c3..486299b5e93 100644
@@ -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 */
configs/colibri_imx7_defconfig +1 -0
index c00d1938eec..202fd05394d 100644
@@ -12,6 +12,7 @@ CONFIG_TARGET_COLIBRI_IMX7=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
+CONFIG_OF_BOARD_FIXUP=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
Signature · 1 line
2.34.1
#36 lore raw

PATCH 21/24 configs: tdx: apalis_imx6: drop hw v1.0 support

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

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

---

 board/toradex/apalis_imx6/apalis_imx6.c | 25 ++-----------------------
 include/configs/apalis_imx6.h           |  6 +-----
 2 files changed, 3 insertions(+), 28 deletions(-)
board/toradex/apalis_imx6/apalis_imx6.c +2 -23
index a78d52d3fac..f33d6a98f53 100644
@@ -665,11 +665,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 +711,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 +1110,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();
include/configs/apalis_imx6.h +1 -5
index 9a611b163ab..373843c0db4 100644
@@ -90,12 +90,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" \
Signature · 1 line
2.34.1
#37 lore raw

PATCH 22/24 configs: tdx: apalis/colibri_imx6: use preboot as well

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

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.

---

 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(-)
configs/apalis_imx6_defconfig +2 -0
index 86216b6e034..28624b53e0c 100644
@@ -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
configs/colibri_imx6_defconfig +2 -0
index fed1ece5709..6ebb6845725 100644
@@ -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
include/configs/apalis_imx6.h +1 -4
index 373843c0db4..b2a818629d1 100644
@@ -90,16 +90,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 \
include/configs/colibri_imx6.h +1 -3
index ff3f3636ede..9a53dc51841 100644
@@ -79,15 +79,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 \
Signature · 1 line
2.34.1
#38 lore raw

PATCH 23/24 configs: colibri-imx6ull/-emmc: use micrel ksz8xxx phy driver

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Use the Micrel KSZ8xxx specific Ethernet PHY driver rather than the generic one.

---

 configs/colibri-imx6ull-emmc_defconfig | 1 +
 configs/colibri-imx6ull_defconfig      | 1 +
 2 files changed, 2 insertions(+)
configs/colibri-imx6ull-emmc_defconfig +1 -0
index cd88320b605..7597b055cc6 100644
@@ -61,6 +61,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_DM_ETH=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
configs/colibri-imx6ull_defconfig +1 -0
index d06cc2f7d82..2943b22a96e 100644
@@ -77,6 +77,7 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ8XXX=y
 CONFIG_DM_ETH=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
Signature · 1 line
2.34.1
#39 lore raw

PATCH 23/24 configs: colibri-imx6ull/-emmc: use micrel ksz8xxx phy driver

Quoted 4 lines

From: Marcel Ziswiler <[email protected]>
Use the Micrel KSZ8xxx specific Ethernet PHY driver rather than the generic one.

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#40 lore raw

PATCH 24/24 board: colibri-imx6ull: fix detecting sd card

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Turns out on certain carrier boards (e.g. Iris V2) and under certain circumstances (e.g. after a software reset) the SD card may have been left in a strange state which later failed as follows:

Colibri iMX6ULL # mmc dev 0
Card did not respond to voltage select! : -110

Fix this as follows:
- Re-name the signaling voltage rail regulator from vmmc to vqmmc.
- Fix the name of the GPIO property to gpios.
- Specify 4-bit bus width, no write-protect capability and no 1.8 volt signaling voltage capability.
- Fix the clock vs. command pull-up vs. push-pull configuration.

---

 arch/arm/dts/imx6ull-colibri.dtsi | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
arch/arm/dts/imx6ull-colibri.dtsi +12 -9
index cbf037be7eb..485fec44ccc 100644
@@ -35,9 +35,9 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
-	reg_sd1_vmmc: regulator-sd1-vmmc {
+	reg_sd1_vqmmc: regulator-sd1-vqmmc {
 		compatible = "regulator-gpio";
-		gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_snvs_reg_sd>;
 		regulator-always-on;
@@ -227,12 +227,15 @@
 	assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>;
 	assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
 	assigned-clock-rates = <0>, <198000000>;
+	bus-width = <4>;
 	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; /* MMC_CD */
+	disable-wp;
+	no-1-8-v;
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
 	pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
 	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
 	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
-	vmmc-supply = <&reg_sd1_vmmc>;
+	vqmmc-supply = <&reg_sd1_vqmmc>;
 	status = "okay";
 };
 
@@ -467,8 +470,8 @@
 
 	pinctrl_usdhc1: usdhc1-grp {
 		fsl,pins = <
-			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x17059
-			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x10059
+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10059
+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059
 			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x17059
 			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x17059
 			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x17059
@@ -478,8 +481,8 @@
 
 	pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp {
 		fsl,pins = <
-			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x170b9
-			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x100b9
+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x100b9
+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x170b9
 			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x170b9
 			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x170b9
 			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x170b9
@@ -489,8 +492,8 @@
 
 	pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp {
 		fsl,pins = <
-			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x170f9
-			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x100f9
+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x100f9
+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x170f9
 			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x170b9
 			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x170b9
 			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x170b9
Signature · 1 line
2.34.1
#41 lore raw

PATCH 24/24 board: colibri-imx6ull: fix detecting sd card

Quoted 12 lines

From: Marcel Ziswiler <[email protected]>
Turns out on certain carrier boards (e.g. Iris V2) and under certain circumstances (e.g. after a software reset) the SD card may have been left in a strange state which later failed as follows:
Colibri iMX6ULL # mmc dev 0
Card did not respond to voltage select! : -110
Fix this as follows:
- Re-name the signaling voltage rail regulator from vmmc to vqmmc.
- Fix the name of the GPIO property to gpios.
- Specify 4-bit bus width, no write-protect capability and no 1.8 volt signaling voltage capability.
- Fix the clock vs. command pull-up vs. push-pull configuration.

Quoted 1 line

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

Best regards,
Stefano Babic

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