toradex updates: assortment of fixes and improvements
Subsystems (4)
v2 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.
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
Signature · 1 line
2.34.1
PATCH v2 1/11 toradex: apalis-imx8x: drop support for apalis imx8x
From: Denys Drozdov <[email protected]>
Drop Apalis iMX8X platform as it never left sample state and is no longer supported.
---
(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
arch/arm/dts/Makefile +0 -1
@@ -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
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
@@ -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
board/toradex/apalis-imx8x/Kconfig deleted +0 -33
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 -82
82 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
@@ -7,7 +7,6 @@ Toradex :maxdepth: 2 apalis-imx8 - apalis-imx8x colibri_imx7 colibri-imx8x verdin-imx8mm
include/configs/apalis-imx8x.h deleted +0 -127
127 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 1/11 toradex: apalis-imx8x: drop support for apalis imx8x
Quoted 5 lines
From: Denys Drozdov <[email protected]>
Drop Apalis iMX8X platform as it never left sample state and is no longer supported.Signed-off-by Denys Drozdov <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 2/11 toradex: globally disable video support
In reply to Marcel ZiswilerFrom: 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.
---
(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(-)
configs/apalis_imx6_defconfig +0 -10
@@ -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
@@ -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
configs/colibri-imx6ull_defconfig +0 -8
@@ -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
configs/colibri_imx6_defconfig +0 -10
@@ -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
@@ -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
@@ -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
@@ -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 -5
@@ -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
Signature · 1 line
2.34.1
PATCH v2 2/11 toradex: globally disable video support
Quoted 6 lines
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.Signed-off-by Igor Opaniuk <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 3/11 toradex: set default dhcp distroboot scriptname
In reply to Marcel ZiswilerFrom: Igor Opaniuk <[email protected]>
Use the same name of DHCP Distroboot script as in regular eMMC case.
---
(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(-)
include/configs/apalis-imx8.h +1 -0
@@ -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
@@ -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
@@ -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" \
include/configs/apalis_t30.h +2 -1
@@ -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"
include/configs/colibri-imx6ull.h +1 -0
@@ -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
@@ -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
@@ -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" \
include/configs/colibri_imx7.h +1 -0
@@ -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
@@ -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
include/configs/colibri_t30.h +2 -1
@@ -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"
include/configs/colibri_vf.h +1 -0
@@ -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" \
include/configs/verdin-imx8mm.h +1 -0
@@ -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" \
Signature · 1 line
2.34.1
PATCH v2 3/11 toradex: set default dhcp distroboot scriptname
Quoted 4 lines
From: Igor Opaniuk <[email protected]>
Use the same name of DHCP Distroboot script as in regular eMMC case.Signed-off-by Igor Opaniuk <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 4/11 toradex: drop legacy nfsboot script
In reply to Marcel ZiswilerFrom: Igor Opaniuk <[email protected]>
Drop legacy nfsboot script in favor of distroboot DHCP boot.
---
(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(-)
include/configs/apalis-imx8.h +0 -5
@@ -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
@@ -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
@@ -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} " \
include/configs/colibri-imx6ull.h +0 -10
@@ -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
@@ -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
@@ -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} " \
include/configs/colibri_imx7.h +0 -10
@@ -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
@@ -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" \
include/configs/verdin-imx8mm.h +0 -6
@@ -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)?; " \
include/configs/verdin-imx8mp.h +0 -6
@@ -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)?; " \
Signature · 1 line
2.34.1
PATCH v2 4/11 toradex: drop legacy nfsboot script
Quoted 4 lines
From: Igor Opaniuk <[email protected]>
Drop legacy nfsboot script in favor of distroboot DHCP boot.Signed-off-by Igor Opaniuk <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 5/11 configs: toradex: enable missing fit options
In reply to Marcel ZiswilerFrom: Oleksandr Suvorov <[email protected]>
Add missing support of FIT-images and enable a verbosity for this feature.
---
(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(+)
configs/apalis-imx8_defconfig +1 -0
@@ -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
configs/apalis-tk1_defconfig +1 -0
@@ -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
@@ -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
configs/colibri-imx6ull-emmc_defconfig +1 -0
@@ -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"
configs/colibri-imx6ull_defconfig +1 -0
@@ -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
configs/colibri-imx8x_defconfig +1 -0
@@ -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
configs/colibri_imx6_defconfig +1 -0
@@ -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
configs/colibri_imx7_defconfig +2 -0
@@ -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
configs/colibri_imx7_emmc_defconfig +1 -0
@@ -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"
configs/verdin-imx8mm_defconfig +1 -0
@@ -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
Signature · 1 line
2.34.1
PATCH v2 5/11 configs: toradex: enable missing fit options
Quoted 5 lines
From: Oleksandr Suvorov <[email protected]> Add missing support of FIT-images and enable a verbosity for this feature.
Signed-off-by Oleksandr Suvorov <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 6/11 configs: colibri-imx7/-emmc: enable booting from usb sdp
In reply to Marcel ZiswilerFrom: Oleksandr Suvorov <[email protected]>
For recovery purpose allow booting via SDP over USB as well.
---
(no changes since v1)
configs/colibri_imx7_defconfig | 1 + configs/colibri_imx7_emmc_defconfig | 1 + 2 files changed, 2 insertions(+)
configs/colibri_imx7_defconfig +1 -0
@@ -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
@@ -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
PATCH v2 6/11 configs: colibri-imx7/-emmc: enable booting from usb sdp
Quoted 4 lines
From: Oleksandr Suvorov <[email protected]> For recovery purpose allow booting via SDP over USB as well.
Signed-off-by Oleksandr Suvorov <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 7/11 configs: tdx: Do not overwrite fdtfile if it got set manually
In reply to Marcel ZiswilerFrom: 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
---
(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(-)
configs/colibri-imx6ull-emmc_defconfig +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
configs/verdin-imx8mm_defconfig +1 -1
@@ -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
configs/verdin-imx8mp_defconfig +1 -1
@@ -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
PATCH v2 7/11 configs: tdx: Do not overwrite fdtfile if it got set manually
Quoted 6 lines
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 manuallySigned-off-by Philippe Schenker <[email protected]>Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 8/11 board: toradex: drop colibri pxa270 support
In reply to Marcel ZiswilerFrom: 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).
---
(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
arch/arm/Kconfig +0 -6
@@ -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"
board/toradex/colibri_pxa270/Kconfig deleted +0 -23
@@ -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
@@ -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
@@ -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
@@ -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 -57
57 lines not on this page · raw message
include/configs/colibri_pxa270.h deleted +0 -151
151 lines not on this page · raw message
include/configs/pxa-common.h deleted +0 -27
@@ -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
PATCH v2 8/11 board: toradex: drop colibri pxa270 support
Quoted 4 lines
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).Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 9/11 board: colibri_imx7: fix usb start on solo
In reply to Marcel ZiswilerFrom: 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.
---
(no changes since v1)
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
@@ -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
@@ -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
Signature · 1 line
2.34.1
PATCH v2 9/11 board: colibri_imx7: fix usb start on solo
Quoted 11 lines
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 dropboard_usb_phy_mode()which is also no longer used in the driver model age.Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 10/11 configs: tdx: apalis_imx6: drop hw v1.0 support
In reply to Marcel ZiswilerFrom: 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.
---
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(-)
board/toradex/apalis_imx6/apalis_imx6.c +2 -36
@@ -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 ();
include/configs/apalis_imx6.h +1 -5
@@ -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" \
Signature · 1 line
2.34.1
PATCH v2 10/11 configs: tdx: apalis_imx6: drop hw v1.0 support
Quoted 4 lines
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.Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================
PATCH v2 11/11 configs: tdx: apalis/colibri_imx6: use preboot as well
In reply to Marcel ZiswilerFrom: 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.
---
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(-)
configs/apalis_imx6_defconfig +2 -0
@@ -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
@@ -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
@@ -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 \
include/configs/colibri_imx6.h +1 -3
@@ -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 \
Signature · 1 line
2.34.1
PATCH v2 11/11 configs: tdx: apalis/colibri_imx6: use preboot as well
Quoted 5 lines
From: Marcel Ziswiler <[email protected]>
Use PREBOOT as well. This allows a customer to just setfdt_boardas on any other module to customize the device tree for his carrier board.Signed-off-by Marcel Ziswiler <[email protected]>
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] =====================================================================