mbox series

Pull request: please pull u-boot-imx-20230503

Message ID d55c7bc7-e754-ea18-c112-fc9b4368e86a@denx.de
State Accepted
Delegated to: Tom Rini
Headers show
Series Pull request: please pull u-boot-imx-20230503 | expand

Pull-request

https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20230503

Message

Stefano Babic May 3, 2023, 11:37 a.m. UTC
Hi Tom,

please pull from u-boot-imx, thanks !


The following changes since commit 50f64026f7a4c2d0a101c93916e01782e4fbbe7f:

   Merge branch 'master' of 
https://source.denx.de/u-boot/custodians/u-boot-spi (2023-05-01 13:29:52 
-0400)

are available in the Git repository at:

   https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git 
tags/u-boot-imx-20230503

for you to fetch changes up to bb6ea0fe9290b4d64df8e716b58515b5325c2ea5:

   usb: ehci-mx6: move phy setup before register access (2023-05-02 
10:57:32 +0200)

----------------------------------------------------------------
u-boot-imx-20230503
-------------------

- Fixes for : pico-imx6ul, smegw01
- new boards: DMSSE20, Reform 2
- fix: get_boot_device, PLL video rate

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/16211

----------------------------------------------------------------
Dario Binacchi (3):
       imx6: clock: improve calculations to get the PLL video rate
       imx6: clock: add support to get LCD pixel clock rate
       imx6: clock: print real pixel clock rate

Eduard Strehlau (12):
       smegw01: Enable setting additional boot params
       smegw01: Select CONFIG_CMD_SQUASHFS
       smegw01: Select bootcount support
       smegw01: Add altbootcmd
       smegw01: Run altbootcmd in the case of failure
       smegw01: Only commit to new partition if update was successful
       smegw01: Enable EMMC boot from multiple partitions
       smegw01: Change default boot device to eMMC
       smegw01: Switch to fitImage
       smegw01: Add lockdown U-Boot env support
       smegw01: Disable additional boot menu options
       smegw01: Fix fallback to altbootcmd

Fabio Estevam (3):
       pico-imx6ul: Convert to CONFIG_DM_SERIAL
       smegw01: Read the second MAC address
       smegw01: Convert CFG_EXTRA_ENV_SETTINGS to an env file

Heinrich Schuchardt (1):
       imx8mn: buffer overflow in low_drive_gpu_freq()

Hugo Villeneuve (1):
       arm: imx8m: remove unused and obsolete board_fix_fdt() in SOC context

Oliver Graute (1):
       imx: support i.MX8QM DMSSE20 a1 board

Patrick Wildt (1):
       board: mntre: imx8mq: Add MNT Reform 2 board support

Tim Harvey (2):
       imx: fix get_boot_device() for imx8
       usb: ehci-mx6: move phy setup before register access

  arch/arm/dts/Makefile                                   |    1 +
  arch/arm/dts/imx8mq-mnt-reform2-u-boot.dtsi             |   11 +++
  arch/arm/dts/imx8qm-dmsse20-a1.dts                      |  397 
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  arch/arm/include/asm/arch-mx6/clock.h                   |    2 +
  arch/arm/mach-imx/imx8/Kconfig                          |    8 ++
  arch/arm/mach-imx/imx8m/Kconfig                         |    7 ++
  arch/arm/mach-imx/imx8m/soc.c                           |   36 +------
  arch/arm/mach-imx/mx6/clock.c                           |   66 
++++++++++++-
  arch/arm/mach-imx/romapi.c                              |    2 +
  board/advantech/imx8qm_dmsse20_a1/Kconfig               |   15 +++
  board/advantech/imx8qm_dmsse20_a1/MAINTAINERS           |    7 ++
  board/advantech/imx8qm_dmsse20_a1/Makefile              |    8 ++
  board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20-a1.env |   48 ++++++++++
  board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c   |  188 
++++++++++++++++++++++++++++++++++++
  board/advantech/imx8qm_dmsse20_a1/imximage.cfg          |   23 +++++
  board/advantech/imx8qm_dmsse20_a1/spl.c                 |  223 
+++++++++++++++++++++++++++++++++++++++++++
  board/mntre/imx8mq_reform2/Kconfig                      |   15 +++
  board/mntre/imx8mq_reform2/MAINTAINERS                  |    7 ++
  board/mntre/imx8mq_reform2/Makefile                     |   12 +++
  board/mntre/imx8mq_reform2/imx8mq_reform2.c             |  171 
+++++++++++++++++++++++++++++++++
  board/mntre/imx8mq_reform2/lpddr4_timing.c              | 1014 
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h          |   95 
+++++++++++++++++++
  board/mntre/imx8mq_reform2/spl.c                        |  260 
++++++++++++++++++++++++++++++++++++++++++++++++++
  board/storopack/smegw01/Kconfig                         |    7 ++
  board/storopack/smegw01/smegw01.c                       |   33 +++++++
  board/storopack/smegw01/smegw01.env                     |   89 
+++++++++++++++++
  common/Kconfig                                          |    2 +-
  configs/imx8mq_reform2_defconfig                        |  107 
+++++++++++++++++++++
  configs/imx8qm_dmsse20a1_defconfig                      |  129 
+++++++++++++++++++++++++
  configs/pico-imx6ul_defconfig                           |    1 +
  configs/smegw01_defconfig                               |   18 +++-
  doc/board/advantech/imx8qm-dmsse20-a1.rst               |   58 
++++++++++++
  doc/board/advantech/index.rst                           |    1 +
  drivers/usb/host/ehci-mx6.c                             |   10 +-
  include/configs/imx8mq_reform2.h                        |   67 
+++++++++++++
  include/configs/imx8qm_dmsse20.h                        |   48 ++++++++++
  include/configs/smegw01.h                               |   36 +++----
  37 files changed, 3162 insertions(+), 60 deletions(-)
  create mode 100644 arch/arm/dts/imx8mq-mnt-reform2-u-boot.dtsi
  create mode 100644 arch/arm/dts/imx8qm-dmsse20-a1.dts
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/Kconfig
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/MAINTAINERS
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/Makefile
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20-a1.env
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/imximage.cfg
  create mode 100644 board/advantech/imx8qm_dmsse20_a1/spl.c
  create mode 100644 board/mntre/imx8mq_reform2/Kconfig
  create mode 100644 board/mntre/imx8mq_reform2/MAINTAINERS
  create mode 100644 board/mntre/imx8mq_reform2/Makefile
  create mode 100644 board/mntre/imx8mq_reform2/imx8mq_reform2.c
  create mode 100644 board/mntre/imx8mq_reform2/lpddr4_timing.c
  create mode 100644 board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h
  create mode 100644 board/mntre/imx8mq_reform2/spl.c
  create mode 100644 board/storopack/smegw01/smegw01.env
  create mode 100644 configs/imx8mq_reform2_defconfig
  create mode 100644 configs/imx8qm_dmsse20a1_defconfig
  create mode 100644 doc/board/advantech/imx8qm-dmsse20-a1.rst
  create mode 100644 include/configs/imx8mq_reform2.h
  create mode 100644 include/configs/imx8qm_dmsse20.h

Best regards,
Stefano

Comments

Tom Rini May 3, 2023, 7 p.m. UTC | #1
On Wed, May 03, 2023 at 01:37:28PM +0200, Stefano Babic wrote:

> Hi Tom,
> 
> please pull from u-boot-imx, thanks !
> 
> 
> The following changes since commit 50f64026f7a4c2d0a101c93916e01782e4fbbe7f:
> 
>   Merge branch 'master' of
> https://source.denx.de/u-boot/custodians/u-boot-spi (2023-05-01 13:29:52
> -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git
> tags/u-boot-imx-20230503
> 
> for you to fetch changes up to bb6ea0fe9290b4d64df8e716b58515b5325c2ea5:
> 
>   usb: ehci-mx6: move phy setup before register access (2023-05-02 10:57:32
> +0200)
> 

So, both my HW test and CI is fine, so I've applied this.  But please
note we now have this scary message to fix:
+(imx8qm_dmsse20a1) aarch64-linux-ld.bfd: invalid origin for memory region .sdram
Fabio Estevam May 3, 2023, 9:25 p.m. UTC | #2
Hi Tom,

On Wed, May 3, 2023 at 4:01 PM Tom Rini <trini@konsulko.com> wrote:

> So, both my HW test and CI is fine, so I've applied this.  But please
> note we now have this scary message to fix:
> +(imx8qm_dmsse20a1) aarch64-linux-ld.bfd: invalid origin for memory region .sdram

I compared the imx8qm_dmsse20a1 against imx8qm_mek_defconfig and with
the following changes the warning is gone:

--- a/configs/imx8qm_dmsse20a1_defconfig
+++ b/configs/imx8qm_dmsse20a1_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_SPL_STACK=0x13e000
 CONFIG_SPL=y
 CONFIG_SYS_LOAD_ADDR=0x80280000
 CONFIG_SYS_MEMTEST_START=0xA0000000
@@ -38,11 +39,17 @@ CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run
loadbootscript; then run bootscript; else if run loadimage; then run
mmcboot; else run netboot; fi; fi; else booti ${loadaddr} -
${fdt_addr}; fi"
 CONFIG_LOG=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL_BSS_START_ADDR=0x00128000
 CONFIG_SPL_MAX_SIZE=0x1f000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x128000
 CONFIG_SPL_BSS_MAX_SIZE=0x1000
 CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SYS_SPL_MALLOC=y
+CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
+CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x120000
+CONFIG_SYS_SPL_MALLOC_SIZE=0x3000
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_POWER_DOMAIN=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y

Oliver, could you please test this change?

I can submit it formally if it works for you.
Oliver Graute May 4, 2023, 7:04 a.m. UTC | #3
> Am 03.05.2023 um 23:25 schrieb Fabio Estevam <festevam@gmail.com>:
> 
> --- a/configs/imx8qm_dmsse20a1_defconfig
> +++ b/configs/imx8qm_dmsse20a1_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SPL_SERIAL=y
> CONFIG_SPL_DRIVERS_MISC=y
> CONFIG_ENV_OFFSET=0x80000
> CONFIG_ENV_SECT_SIZE=0x20000
> +CONFIG_SPL_STACK=0x13e000
> CONFIG_SPL=y
> CONFIG_SYS_LOAD_ADDR=0x80280000
> CONFIG_SYS_MEMTEST_START=0xA0000000
> @@ -38,11 +39,17 @@ CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run
> loadbootscript; then run bootscript; else if run loadimage; then run
> mmcboot; else run netboot; fi; fi; else booti ${loadaddr} -
> ${fdt_addr}; fi"
> CONFIG_LOG=y
> CONFIG_BOARD_EARLY_INIT_F=y
> -CONFIG_SPL_BSS_START_ADDR=0x00128000
> CONFIG_SPL_MAX_SIZE=0x1f000
> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> +CONFIG_SPL_BSS_START_ADDR=0x128000
> CONFIG_SPL_BSS_MAX_SIZE=0x1000
> CONFIG_SPL_BOARD_INIT=y
> -CONFIG_SPL_SEPARATE_BSS=y
> +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> +CONFIG_SYS_SPL_MALLOC=y
> +CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
> +CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x120000
> +CONFIG_SYS_SPL_MALLOC_SIZE=0x3000
> CONFIG_SPL_POWER_SUPPORT=y
> CONFIG_SPL_POWER_DOMAIN=y
> CONFIG_SPL_WATCHDOG_SUPPORT=y

Hello Fabio,

just tested this change and its working fine on the dmsse20a1 board.

Tested-by: Oliver Graute <oliver.graute@kococonnector.com>

Best regards,

Oliver