imx: imx6ul: kontron-sl-mx6ul: Fixes and improvements
Subsystems (3)
cover imx: imx6ul: kontron-sl-mx6ul: Fixes and improvements
From: Frieder Schrempf <[email protected]>
This series fixes some issues with the kontron-sl-mx6ul board configuration. It also syncs devicetrees with changes in the Linux kernel.
Notes:
* This series is based on imx/master and fixes the previously merged sync patch from Marcel [1].
* The devicetree changes this is based on are still pending in Linux (see [2]).
[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[2] https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/
Frieder Schrempf (6):
Makefile: Make flash.bin target available for all platforms
imx: imx6ul: kontron-sl-mx6ul: Enable migrated Kconfig options
imx: imx6ul: kontron-sl-mx6ul: Fix CONFIG_ENV_SPI_BUS
imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
imx: imx6ul: kontron-sl-mx6ul: Migrate to use CONFIG_EXTRA_ENV_TEXT
imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
Makefile | 4 +-
arch/arm/dts/Makefile | 4 +-
arch/arm/dts/imx6ul-kontron-bl-43.dts | 103 +++++
...i => imx6ul-kontron-bl-common-u-boot.dtsi} | 0
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...oot.dtsi => imx6ul-kontron-bl-u-boot.dtsi} | 2 +-
...tron-n631x-s.dts => imx6ul-kontron-bl.dts} | 9 +-
arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +
...-n631x-som.dtsi => imx6ul-kontron-sl.dtsi} | 6 +-
...ot.dtsi => imx6ull-kontron-bl-u-boot.dtsi} | 2 +-
arch/arm/dts/imx6ull-kontron-bl.dts | 15 +
arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 -
...n641x-som.dtsi => imx6ull-kontron-sl.dtsi} | 6 +-
board/kontron/sl-mx6ul/MAINTAINERS | 6 +-
board/kontron/sl-mx6ul/Makefile | 2 +
board/kontron/sl-mx6ul/sl-mx6ul-common.c | 24 +
board/kontron/sl-mx6ul/sl-mx6ul-common.h | 11 +
board/kontron/sl-mx6ul/sl-mx6ul.c | 15 +
board/kontron/sl-mx6ul/sl-mx6ul.env | 4 +
board/kontron/sl-mx6ul/spl.c | 39 +-
configs/kontron-sl-mx6ul_defconfig | 13 +-
include/configs/kontron-sl-mx6ul.h | 10 +-
23 files changed, 242 insertions(+), 487 deletions(-)
create mode 100644 arch/arm/dts/imx6ul-kontron-bl-43.dts
rename arch/arm/dts/{imx6ul-kontron-n6x1x-s-u-boot.dtsi => imx6ul-kontron-bl-common-u-boot.dtsi} (100%)
rename arch/arm/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/dts/{imx6ul-kontron-n631x-s-u-boot.dtsi => imx6ul-kontron-bl-u-boot.dtsi} (75%)
rename arch/arm/dts/{imx6ul-kontron-n631x-s.dts => imx6ul-kontron-bl.dts} (52%)
delete mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dts
rename arch/arm/dts/{imx6ul-kontron-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
rename arch/arm/dts/{imx6ul-kontron-n631x-som.dtsi => imx6ul-kontron-sl.dtsi} (62%)
rename arch/arm/dts/{imx6ull-kontron-n641x-s-u-boot.dtsi => imx6ull-kontron-bl-u-boot.dtsi} (75%)
create mode 100644 arch/arm/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s.dts
rename arch/arm/dts/{imx6ull-kontron-n641x-som.dtsi => imx6ull-kontron-sl.dtsi} (55%)
create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul-common.c
create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul-common.h
create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul.envSignature · 1 line
2.37.2
PATCH 1/6 Makefile: Make flash.bin target available for all platforms
From: Frieder Schrempf <[email protected]>
There is no reason for restricting the use of the flash.bin target to the i.MX8 platform. Others can benefit from this as well.
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -1546,7 +1546,7 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE SPL: spl/u-boot-spl.bin FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@ -ifeq ($(CONFIG_ARCH_IMX8M)$(CONFIG_ARCH_IMX8), y) +#ifeq ($(CONFIG_ARCH_IMX8M)$(CONFIG_ARCH_IMX8), y) ifeq ($(CONFIG_SPL_LOAD_IMX_CONTAINER), y) u-boot.cnt: u-boot.bin FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
@@ -1562,7 +1562,7 @@ flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@ endif endif -endif +#endif u-boot.uim: u-boot.bin FORCE $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
Signature · 1 line
2.37.2
PATCH 1/6 Makefile: Make flash.bin target available for all platforms
Quoted 4 lines
From: Frieder Schrempf <[email protected]> There is no reason for restricting the use of the flash.bin target to the i.MX8 platform. Others can benefit from this as well.
Signed-off-by Frieder Schrempf <[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 2/6 imx: imx6ul: kontron-sl-mx6ul: Enable migrated Kconfig options
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
The board support was merged at the same time as some Kconfig options for SPL were migrated/renamed. As a result some essential features like serial output, MMC support, etc. are currently missing. Fix this by enabling the required options.
--- configs/kontron-sl-mx6ul_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
configs/kontron-sl-mx6ul_defconfig +8 -0
@@ -14,8 +14,12 @@ CONFIG_TARGET_KONTRON_MX6UL=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-kontron-n631x-s" CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC=y +CONFIG_SPL_SERIAL=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_DISTRO_DEFAULTS=y
@@ -26,11 +30,15 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y CONFIG_SYS_SPL_MALLOC=y +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400 CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG=y CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=532
Signature · 1 line
2.37.2
PATCH 2/6 imx: imx6ul: kontron-sl-mx6ul: Enable migrated Kconfig options
Quoted 6 lines
From: Frieder Schrempf <[email protected]>
The board support was merged at the same time as someKconfigoptions for SPL were migrated/renamed. As a result some essential features like serial output, MMC support, etc. are currently missing. Fix this by enabling the required options.Signed-off-by Frieder Schrempf <[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 3/6 imx: imx6ul: kontron-sl-mx6ul: Fix CONFIG_ENV_SPI_BUS
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
The SPI NOR is on ECSPI1 so CONFIG_ENV_SPI_BUS should be 1 to detect the environment on the SPI NOR.
--- configs/kontron-sl-mx6ul_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/kontron-sl-mx6ul_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_OF_LIST="imx6ul-kontron-n631x-s imx6ull-kontron-n641x-s" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_SPI_BUS=2 CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eth0" CONFIG_BOOTCOUNT_LIMIT=y
Signature · 1 line
2.37.2
PATCH 3/6 imx: imx6ul: kontron-sl-mx6ul: Fix CONFIG_ENV_SPI_BUS
Quoted 4 lines
From: Frieder Schrempf <[email protected]> The SPI NOR is on ECSPI1 so
CONFIG_ENV_SPI_BUSshould be 1 to detect the environment on the SPI NOR.Signed-off-by Frieder Schrempf <[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 4/6 imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Instead of checking both, SPI NOR and MMC for loading U-Boot proper and the environment, implement a way to detect the actual boot device even if the BootROM doesn't report it and we can't rely solely on the fuse settings, as by default we use MMC as primary boot device and boot from SPI NOR via the secondary fallback device (EEPROM Recovery Mode).
--- board/kontron/sl-mx6ul/Makefile | 2 ++ board/kontron/sl-mx6ul/sl-mx6ul-common.c | 24 ++++++++++++++++++++++++ board/kontron/sl-mx6ul/sl-mx6ul-common.h | 11 +++++++++++ board/kontron/sl-mx6ul/sl-mx6ul.c | 15 +++++++++++++++ board/kontron/sl-mx6ul/spl.c | 23 ++++++++++++++--------- 5 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul-common.c create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul-common.h
board/kontron/sl-mx6ul/Makefile +2 -0
@@ -6,3 +6,5 @@ obj-y := spl.o else obj-y := sl-mx6ul.o endif + +obj-y += sl-mx6ul-common.o
board/kontron/sl-mx6ul/sl-mx6ul-common.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2022 Kontron Electronics GmbH +*/ + +#include <asm/types.h> +#include <asm/arch/sys_proto.h> + +#include <sl-mx6ul-common.h> + +bool sl_mx6ul_is_spi_nor_boot (void ) +{ +u32 bmode =imx6_src_get_boot_mode (); + +/* +* Check if "EEPROM Recovery" enabled and ECSPI2_CONREG not 0x0. +* If this is the case and U-Boot didn't initialize the SPI bus +* yet, we can safely assume that we are booting from SPI NOR. +*/ +if ((bmode &0x40000000 ) &&readl (0x0200c008 )) +return true; + +return false; +}
board/kontron/sl-mx6ul/sl-mx6ul-common.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2022 Kontron Electronics GmbH +*/ + +#ifndef __SL_MX6UL_COMMON_H +#define __SL_MX6UL_COMMON_H + +bool sl_mx6ul_is_spi_nor_boot (void ); + +#endif // __SL_MX6UL_COMMON_H
board/kontron/sl-mx6ul/sl-mx6ul.c +15 -0
@@ -6,8 +6,10 @@#include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/global_data.h> +#include <env_internal.h> #include <fdt_support.h> #include <phy.h> +#include <sl-mx6ul-common.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -83,3 +85,16 @@ int board_init(void)return 0 ; } + +enum env_location env_get_location (enum env_operation op,int prio) +{ +if (prio) +return ENVL_UNKNOWN ; + +if (sl_mx6ul_is_spi_nor_boot () &&CONFIG_IS_ENABLED (ENV_IS_IN_SPI_FLASH )) +return ENVL_SPI_FLASH ; +else if (CONFIG_IS_ENABLED (ENV_IS_IN_MMC )) +return ENVL_MMC ; + +return ENVL_NOWHERE ; +}
board/kontron/sl-mx6ul/spl.c +14 -9
@@ -17,6 +17,7 @@#include <linux/sizes.h> #include <linux/errno.h> #include <mmc.h> +#include <sl-mx6ul-common.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -339,26 +340,30 @@ void board_boot_order(u32 *spl_boot_list)/* * The default boot fuse settings use the SD card (MMC1) as primary -* boot device, but allow SPI NOR as a fallback boot device. -* We can't detect the fallback case and spl_boot_device() will return -* BOOT_DEVICE_MMC1 despite the actual boot device being SPI NOR. -* Therefore we try to load U-Boot proper vom SPI NOR after loading -* from MMC has failed. +* boot device, but allow SPI NOR as a fallback boot device. There +* is no proper way to detect if the fallback was used. Therefore +* we read the ECSPI2_CONREG register and see if it differs from the +* reset value 0x0. If that's the case we can assume that the BootROM +* has successfully probed the SPI NOR. */ - spl_boot_list[0 ] = bootdev; -switch (bootdev) {case BOOT_DEVICE_MMC1 :case BOOT_DEVICE_MMC2 : - spl_boot_list[1 ] =BOOT_DEVICE_SPI ; +if (sl_mx6ul_is_spi_nor_boot ()) { + spl_boot_list[0 ] =BOOT_DEVICE_SPI ; +return ; + }break ; } + + spl_boot_list[0 ] = bootdev; }int board_early_init_f (void ) {setup_iomux_uart (); -setup_spi (); +if (sl_mx6ul_is_spi_nor_boot ()) +setup_spi ();return 0 ; }
Signature · 1 line
2.37.2
PATCH 4/6 imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
Quoted 8 lines
From: Frieder Schrempf <[email protected]> Instead of checking both, SPI NOR and MMC for loading U-Boot proper and the environment, implement a way to detect the actual boot device even if the BootROM doesn't report it and we can't rely solely on the fuse settings, as by default we use MMC as primary boot device and boot from SPI NOR via the secondary fallback device (EEPROM Recovery Mode).
Signed-off-by Frieder Schrempf <[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 5/6 imx: imx6ul: kontron-sl-mx6ul: Migrate to use CONFIG_EXTRA_ENV_TEXT
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Move the environment from the board header to a separate text file and also drop those variables that are already set in env_default.h from the Kconfig options or are not needed anymore.
--- board/kontron/sl-mx6ul/sl-mx6ul.env | 4 ++++ include/configs/kontron-sl-mx6ul.h | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul.env
board/kontron/sl-mx6ul/sl-mx6ul.env new file +4 -0
@@ -0,0 +1,4 @@ +kernel_addr_r=0x82000000 +ramdisk_addr_r=0x88080000 +pxefile_addr_r=0x80100000 +scriptaddr=0x80100000
include/configs/kontron-sl-mx6ul.h +1 -9
@@ -49,14 +49,6 @@#define CONFIG_SYS_FSL_USDHC_NUM 2#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x88080000\0" \ - "pxefile_addr_r=0x80100000\0" \ - "scriptaddr=0x80100000\0" \ - "bootdelay=3\0" \ - "ethact=" CONFIG_ETHPRIME "\0" \ - "hostname=" CONFIG_HOSTNAME "\0" \ - BOOTENV +#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV#endif /* __KONTRON_MX6UL_CONFIG_H */
Signature · 1 line
2.37.2
PATCH 5/6 imx: imx6ul: kontron-sl-mx6ul: Migrate to use CONFIG_EXTRA_ENV_TEXT
Quoted 5 lines
From: Frieder Schrempf <[email protected]> Move the environment from the board header to a separate text file and also drop those variables that are already set in
env_default.hfrom theKconfigoptions or are not needed anymore.Signed-off-by Frieder Schrempf <[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 6/6 imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
In reply to Frieder SchrempfFrom: Frieder Schrempf <[email protected]>
Sync the devicetrees with Linux and adjust the board names.
---
Note:
* The devicetree changes this is based on are still pending in Linux
(see https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/).
---
arch/arm/dts/Makefile | 4 +-
arch/arm/dts/imx6ul-kontron-bl-43.dts | 103 +++++
...i => imx6ul-kontron-bl-common-u-boot.dtsi} | 0
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...oot.dtsi => imx6ul-kontron-bl-u-boot.dtsi} | 2 +-
...tron-n631x-s.dts => imx6ul-kontron-bl.dts} | 9 +-
arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +
...-n631x-som.dtsi => imx6ul-kontron-sl.dtsi} | 6 +-
...ot.dtsi => imx6ull-kontron-bl-u-boot.dtsi} | 2 +-
arch/arm/dts/imx6ull-kontron-bl.dts | 15 +
arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 -
...n641x-som.dtsi => imx6ull-kontron-sl.dtsi} | 6 +-
board/kontron/sl-mx6ul/MAINTAINERS | 6 +-
board/kontron/sl-mx6ul/spl.c | 16 +-
configs/kontron-sl-mx6ul_defconfig | 4 +-
16 files changed, 161 insertions(+), 466 deletions(-)
create mode 100644 arch/arm/dts/imx6ul-kontron-bl-43.dts
rename arch/arm/dts/{imx6ul-kontron-n6x1x-s-u-boot.dtsi => imx6ul-kontron-bl-common-u-boot.dtsi} (100%)
rename arch/arm/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/dts/{imx6ul-kontron-n631x-s-u-boot.dtsi => imx6ul-kontron-bl-u-boot.dtsi} (75%)
rename arch/arm/dts/{imx6ul-kontron-n631x-s.dts => imx6ul-kontron-bl.dts} (52%)
delete mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dts
rename arch/arm/dts/{imx6ul-kontron-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
rename arch/arm/dts/{imx6ul-kontron-n631x-som.dtsi => imx6ul-kontron-sl.dtsi} (62%)
rename arch/arm/dts/{imx6ull-kontron-n641x-s-u-boot.dtsi => imx6ull-kontron-bl-u-boot.dtsi} (75%)
create mode 100644 arch/arm/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s.dts
rename arch/arm/dts/{imx6ull-kontron-n641x-som.dtsi => imx6ull-kontron-sl.dtsi} (55%)arch/arm/dts/Makefile +2 -2
@@ -879,8 +879,8 @@ dtb-$(CONFIG_MX6UL) += \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-pico-hobbit.dtb \ imx6ul-pico-pi.dtb \ - imx6ul-kontron-n631x-s.dtb \ - imx6ull-kontron-n641x-s.dtb + imx6ul-kontron-bl.dtb \ + imx6ull-kontron-bl.dtb dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \
arch/arm/dts/imx6ul-kontron-bl-43.dts new file +103 -0
103 lines not on this page · raw message
arch/arm/dts/imx6ul-kontron-bl-common-u-boot.dtsi renamed from arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi +0 -0
arch/arm/dts/imx6ul-kontron-bl-common.dtsi renamed from arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi +0 -0
arch/arm/dts/imx6ul-kontron-bl-u-boot.dtsi renamed from arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi +1 -1
@@ -4,4 +4,4 @@ * Copyright (C) 2018 Kontron Electronics GmbH */ -#include "imx6ul-kontron-n6x1x-s-u-boot.dtsi" +#include "imx6ul-kontron-bl-common-u-boot.dtsi"
arch/arm/dts/imx6ul-kontron-bl.dts renamed from arch/arm/dts/imx6ul-kontron-n631x-s.dts +4 -5
@@ -7,11 +7,10 @@ /dts-v1/; -#include "imx6ul-kontron-n631x-som.dtsi" -#include "imx6ul-kontron-n6x1x-s.dtsi" +#include "imx6ul-kontron-sl.dtsi" +#include "imx6ul-kontron-bl-common.dtsi" / { - model = "Kontron N631X S"; - compatible = "kontron,imx6ul-n631x-s", "kontron,imx6ul-n631x-som", - "fsl,imx6ul"; + model = "Kontron BL i.MX6UL (N631X S)"; + compatible = "kontron,bl-imx6ul", "kontron,sl-imx6ul", "fsl,imx6ul"; };
arch/arm/dts/imx6ul-kontron-n6x1x-s.dts deleted +0 -423
423 lines not on this page · raw message
arch/arm/dts/imx6ul-kontron-sl-common.dtsi renamed from arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi +15 -0
@@ -11,6 +11,11 @@ chosen { stdout-path = &uart4; }; + + memory@80000000 { + reg = <0x80000000 0x10000000>; + device_type = "memory"; + }; }; &ecspi2 {
@@ -55,6 +60,16 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_qspi>; status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-nand"; + spi-max-frequency = <104000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + reg = <0>; + }; }; &wdog1 {
arch/arm/dts/imx6ul-kontron-sl.dtsi renamed from arch/arm/dts/imx6ul-kontron-n631x-som.dtsi +3 -3
@@ -6,9 +6,9 @@ */ #include "imx6ul.dtsi" -#include "imx6ul-kontron-n6x1x-som-common.dtsi" +#include "imx6ul-kontron-sl-common.dtsi" / { - model = "Kontron N631X SOM"; - compatible = "kontron,imx6ul-n631x-som", "fsl,imx6ul"; + model = "Kontron SL i.MX6UL (N631X SOM)"; + compatible = "kontron,sl-imx6ul", "fsl,imx6ul"; };
arch/arm/dts/imx6ull-kontron-bl-u-boot.dtsi renamed from arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi +1 -1
@@ -4,4 +4,4 @@ * Copyright (C) 2018 Kontron Electronics GmbH */ -#include "imx6ul-kontron-n6x1x-s-u-boot.dtsi" +#include "imx6ul-kontron-bl-common-u-boot.dtsi"
arch/arm/dts/imx6ull-kontron-bl.dts new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +/dts-v1/; + +#include "imx6ull-kontron-sl.dtsi" +#include "imx6ul-kontron-bl-common.dtsi" + +/ { + model = "Kontron BL i.MX6ULL (N641X S)"; + compatible = "kontron,bl-imx6ull", "kontron,sl-imx6ull", "fsl,imx6ull"; +};
arch/arm/dts/imx6ull-kontron-n641x-s.dts deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2017 exceet electronics GmbH - * Copyright (C) 2019 Kontron Electronics GmbH - */ - -/dts-v1/; - -#include "imx6ull-kontron-n641x-som.dtsi" -#include "imx6ul-kontron-n6x1x-s.dtsi" - -/ { - model = "Kontron N641X S"; - compatible = "kontron,imx6ull-n641x-s", "kontron,imx6ull-n641x-som", - "fsl,imx6ull"; -};
arch/arm/dts/imx6ull-kontron-sl.dtsi renamed from arch/arm/dts/imx6ull-kontron-n641x-som.dtsi +3 -3
@@ -5,9 +5,9 @@ */ #include "imx6ull.dtsi" -#include "imx6ul-kontron-n6x1x-som-common.dtsi" +#include "imx6ul-kontron-sl-common.dtsi" / { - model = "Kontron N641X SOM"; - compatible = "kontron,imx6ull-n641x-som", "fsl,imx6ull"; + model = "Kontron SL i.MX6ULL (N641X SOM)"; + compatible = "kontron,sl-imx6ull", "fsl,imx6ull"; };
board/kontron/sl-mx6ul/MAINTAINERS +4 -2
@@ -1,8 +1,10 @@ Kontron SL/BL i.MX6UL/ULL Boards (N63xx/N64xx) M: Frieder Schrempf <[email protected]> S: Maintained -F: arch/arm/dts/imx6ul-kontron-n6* -F: arch/arm/dts/imx6ull-kontron-n6* +F: arch/arm/dts/imx6ul-kontron-sl* +F: arch/arm/dts/imx6ul-kontron-bl* +F: arch/arm/dts/imx6ull-kontron-sl* +F: arch/arm/dts/imx6ull-kontron-bl* F: board/kontron/sl-mx6ul F: configs/kontron-sl-mx6ul_defconfig F: doc/board/kontron/sl-mx6ul.rst
board/kontron/sl-mx6ul/spl.c +8 -8
@@ -22,8 +22,8 @@DECLARE_GLOBAL_DATA_PTR ;enum { -BOARD_TYPE_KTN_N631X =1 , -BOARD_TYPE_KTN_N641X , +BOARD_TYPE_KTN_SL_UL =1 , +BOARD_TYPE_KTN_SL_ULL ,BOARD_TYPE_MAX };
@@ -295,9 +295,9 @@ static void spl_dram_init(void)static int do_board_detect (void ) {if (is_mx6ul ()) - gd->board_type =BOARD_TYPE_KTN_N631X ; + gd->board_type =BOARD_TYPE_KTN_SL_UL ;else if (is_mx6ull ()) - gd->board_type =BOARD_TYPE_KTN_N641X ; + gd->board_type =BOARD_TYPE_KTN_SL_ULL ;printf ("Kontron SL i.MX6UL%s (N6%s1x) module, %lu MB RAM detected\n" ,is_mx6ull () ?"L" :"" ,is_mx6ull () ?"4" :"3" , gd->ram_size /SZ_1M );
@@ -370,12 +370,12 @@ int board_early_init_f(void)int board_fit_config_name_match (const char *name) { -if (gd->board_type ==BOARD_TYPE_KTN_N631X &&is_mx6ul () && - !strcmp (name,"imx6ul-kontron-n631x-s" )) +if (gd->board_type ==BOARD_TYPE_KTN_SL_UL &&is_mx6ul () && + (!strcmp (name,"imx6ul-kontron-n631x-s" ) || !strcmp (name,"imx6ul-kontron-bl" )))return 0 ; -if (gd->board_type ==BOARD_TYPE_KTN_N641X &&is_mx6ull () && - !strcmp (name,"imx6ull-kontron-n641x-s" )) +if (gd->board_type ==BOARD_TYPE_KTN_SL_ULL &&is_mx6ull () && + (!strcmp (name,"imx6ull-kontron-n641x-s" ) || !strcmp (name,"imx6ull-kontron-bl" )))return 0 ;return -1 ;
configs/kontron-sl-mx6ul_defconfig +2 -2
@@ -12,7 +12,7 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_MX6UL=y CONFIG_TARGET_KONTRON_MX6UL=y CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx6ul-kontron-n631x-s" +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-kontron-bl" CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
@@ -60,7 +60,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi1.0:128k(spl),832k(u-boot),64k(env);spi4.0: CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="imx6ul-kontron-n631x-s imx6ull-kontron-n641x-s" +CONFIG_OF_LIST="imx6ul-kontron-bl imx6ull-kontron-bl" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_SPI_FLASH=y
Signature · 1 line
2.37.2
PATCH 6/6 imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
Quoted 3 lines
From: Frieder Schrempf <[email protected]> Sync the devicetrees with Linux and adjust the board names.
Signed-off-by Frieder Schrempf <[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] =====================================================================
Hi Stefano,
Quoted 16 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This series fixes some issues with the kontron-sl-mx6ul board configuration. It also syncs devicetrees with changes in the Linux kernel.
Notes:
* This series is based on imx/master and fixes the previously merged sync patch from Marcel [1].
* The devicetree changes this is based on are still pending in Linux (see [2]).[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[2] https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/
Quoted 8 lines
Frieder Schrempf (6):
Makefile: Make flash.bin target available for all platforms
imx: imx6ul: kontron-sl-mx6ul: Enable migratedKconfigoptions
imx: imx6ul: kontron-sl-mx6ul: FixCONFIG_ENV_SPI_BUS
imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
imx: imx6ul: kontron-sl-mx6ul: Migrate to useCONFIG_EXTRA_ENV_TEXT
imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
Can you please merge these patches so they land in v2023.01?
These have been around for two months and contain some important fixes for the kontron-sl-mx6ul board configuration.
Thanks!
Frieder
Quoted 28 lines · Frieder Schrempf
Hi Stefano,
Quoted 16 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This series fixes some issues with the kontron-sl-mx6ul board configuration. It also syncs devicetrees with changes in the Linux kernel.
Notes:
* This series is based on imx/master and fixes the previously merged sync patch from Marcel [1].
* The devicetree changes this is based on are still pending in Linux (see [2]).[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[2] https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/Quoted 8 lines
Frieder Schrempf (6):
Makefile: Make flash.bin target available for all platforms
imx: imx6ul: kontron-sl-mx6ul: Enable migratedKconfigoptions
imx: imx6ul: kontron-sl-mx6ul: FixCONFIG_ENV_SPI_BUS
imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
imx: imx6ul: kontron-sl-mx6ul: Migrate to useCONFIG_EXTRA_ENV_TEXT
imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
Quoted 4 lines
Can you please merge these patches so they land in v2023.01?
These have been around for two months and contain some important fixes for the kontron-sl-mx6ul board configuration.
Ah, I just saw that they are already in imx/master. Sorry for the noise. For some reason I didn't get pull notification e-mails while for my other patches I got them.
Quoted 29 lines · Frieder Schrempf
Quoted 28 lines · Frieder Schrempf
Hi Stefano,
Quoted 24 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This series fixes some issues with the kontron-sl-mx6ul board configuration. It also syncs devicetrees with changes in the Linux kernel.
Notes:
* This series is based on imx/master and fixes the previously merged sync patch from Marcel [1].
* The devicetree changes this is based on are still pending in Linux (see [2]).[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
[2] https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/Frieder Schrempf (6):
Makefile: Make flash.bin target available for all platforms
imx: imx6ul: kontron-sl-mx6ul: Enable migratedKconfigoptions
imx: imx6ul: kontron-sl-mx6ul: FixCONFIG_ENV_SPI_BUS
imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
imx: imx6ul: kontron-sl-mx6ul: Migrate to useCONFIG_EXTRA_ENV_TEXT
imx: imx6ul: kontron-sl-mx6ul: Sync devicetrees
Quoted 8 lines
Quoted 4 lines
Can you please merge these patches so they land in v2023.01?
These have been around for two months and contain some important fixes for the kontron-sl-mx6ul board configuration.
Ah, I just saw that they are already in imx/master. Sorry for the noise. For some reason I didn't get pull notification e-mails while for my other patches I got them.
I have checked this - my script takes the address of the sender (see on ML's archive), notification were sent to [email protected], while patches are signed with your company's address.
Regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Quoted 37 lines · Stefano Babic
Quoted 36 lines · Frieder Schrempf
Quoted 34 lines · Frieder Schrempf
Hi Stefano,
Quoted 18 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This series fixes some issues with the kontron-sl-mx6ul board configuration. It also syncs devicetrees with changes in the Linux kernel.
Notes:
* This series is based on imx/master and fixes the previously merged sync patch from Marcel [1].
* The devicetree changes this is based on are still pending in Linux (see [2]).[1]
https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Fuboot%2Fpatch%2F20220721132748.1052244-9-marcel%40ziswiler.com%2F&data=05%7C01%7Cfrieder.schrempf%40kontron.de%7C4deee8897fe44b72318108dab59815ee%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C638021962049269997%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Sh3dZSPrhNUVmZdotMhw0r5n24fPT7UC6DRoudGBbJY%3D&reserved=0
[2]
https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.kernel.org%2Fproject%2Flinux-arm-kernel%2Fcover%2F20220815082814.27651-1-frieder%40fris.de%2F&data=05%7C01%7Cfrieder.schrempf%40kontron.de%7C4deee8897fe44b72318108dab59815ee%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C638021962049269997%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=q9AYIukI4fUI%2FRMY%2BFFuZslxszpHLyJcIWQOdyNDoXI%3D&reserved=0Quoted 8 lines
Frieder Schrempf (6):
Makefile: Make flash.bin target available for all platforms
imx: imx6ul: kontron-sl-mx6ul: Enable migratedKconfigoptions
imx: imx6ul: kontron-sl-mx6ul: FixCONFIG_ENV_SPI_BUS
imx: imx6ul: kontron-sl-mx6ul: Select correct boot and env device
imx: imx6ul: kontron-sl-mx6ul: Migrate to useCONFIG_EXTRA_ENV_TEXT
imx: imx6ul: kontron-sl-mx6ul: Sync devicetreesCan you please merge these patches so they land in v2023.01?
These have been around for two months and contain some important fixes for the kontron-sl-mx6ul board configuration.
Quoted 8 lines
Quoted 3 lines
Ah, I just saw that they are already in imx/master. Sorry for the noise. For some reason I didn't get pull notification e-mails while for my other patches I got them.
I have checked this - my script takes the address of the sender (see on ML's archive), notification were sent to [email protected], while patches are signed with your company's address.
True, I got all the notifications there. So probably the forwarding rules in my mailbox don't work properly. Thanks for checking!