March 2023 - U-Boot

[PATCH v2 1/3] arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR
by Marek Vasut 26 Mar '23

26 Mar '23

There is an existing CONFIG_MCFTMR Kconfig symbol, use it and drop all other instances of CFG_MCFTMR. This duality is likely a result of bogus conversion to Kconfig. Fixes: 7ff7b46e6ce ("m68k: rename CONFIG_MCFTMR to CFG_MCFTMR") Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Angelo Dureghello <angelo(a)kernel-space.org> Cc: Huan Wang <alison.wang(a)nxp.com> Cc: Marek Vasut <marek.vasut+renesas(a)mailbox.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Roese <sr(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- V2: Add Fixes tag --- arch/m68k/Kconfig | 1 + arch/m68k/cpu/mcf523x/interrupts.c | 2 +- arch/m68k/cpu/mcf52x2/interrupts.c | 12 ++++++------ arch/m68k/cpu/mcf532x/interrupts.c | 2 +- arch/m68k/cpu/mcf5445x/interrupts.c | 2 +- arch/m68k/include/asm/immap.h | 24 ++++++++++++------------ arch/m68k/lib/time.c | 4 ++-- board/freescale/m53017evb/README | 2 +- board/freescale/m5373evb/README | 2 +- include/configs/M5208EVBE.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5249EVB.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/M5282EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/amcore.h | 1 - include/configs/astro_mcf5373l.h | 1 - include/configs/cobra5272.h | 1 - include/configs/eb_cpu5282.h | 1 - include/configs/stmark2.h | 1 - 24 files changed, 26 insertions(+), 40 deletions(-) diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 76233ef563f..32759cde47d 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -200,5 +200,6 @@ source "board/sysam/stmark2/Kconfig" config MCFTMR bool "Use DMA timer" + default y endmenu diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index b02ea29f635..09c7f9e67cc 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -22,7 +22,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index e787c7605f8..c5ed0600736 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -34,7 +34,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { intctrl_t *intp = (intctrl_t *) (CFG_SYS_INTR_BASE); @@ -42,7 +42,7 @@ void dtimer_intr_setup(void) clrbits_be32(&intp->int_icr1, INT_ICR1_TMR3MASK); setbits_be32(&intp->int_icr1, CFG_SYS_TMRINTR_PRI); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5272 */ #if defined(CONFIG_M5208) || defined(CONFIG_M5282) || \ @@ -63,7 +63,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); @@ -72,7 +72,7 @@ void dtimer_intr_setup(void) clrbits_be32(&intp->imrl0, 0x00000001); clrbits_be32(&intp->imrl0, CFG_SYS_TMRINTR_MASK); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5282 | CONFIG_M5271 | CONFIG_M5275 */ #if defined(CONFIG_M5249) || defined(CONFIG_M5253) @@ -83,11 +83,11 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { mbar_writeLong(MCFSIM_IMR, mbar_readLong(MCFSIM_IMR) & ~0x00000400); mbar_writeByte(MCFSIM_TIMER2ICR, CFG_SYS_TMRINTR_PRI); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5249 || CONFIG_M5253 */ diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index bbe823c0cf7..4f72fa88e58 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -23,7 +23,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index fb80a879c7e..400f3dee879 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -26,7 +26,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index 74516cc6219..3b515fe2c65 100644 --- a/arch/m68k/include/asm/immap.h +++ b/arch/m68k/include/asm/immap.h @@ -16,7 +16,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -38,7 +38,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -63,7 +63,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (mbar_readLong(MCFSIM_IPR)) @@ -86,7 +86,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (mbar_readLong(MCFSIM_IPR)) @@ -105,7 +105,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -130,7 +130,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_TMR0) #define CFG_SYS_TMR_BASE (MMAP_TMR3) #define CFG_SYS_TMRPND_REG (((volatile intctrl_t *)(CFG_SYS_INTR_BASE))->int_isr) @@ -152,7 +152,7 @@ #define CFG_SYS_NUM_IRQS (192) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -174,7 +174,7 @@ #define CFG_SYS_NUM_IRQS (128) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -196,7 +196,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile intctrl_t *) \ @@ -217,7 +217,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -239,7 +239,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -269,7 +269,7 @@ #define MMAP_DSPI MMAP_DSPI0 /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((int0_t *)(CFG_SYS_INTR_BASE))->iprh0) diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index ca8c0396235..500e4dbbba2 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -25,7 +25,7 @@ static volatile ulong timestamp = 0; #define CFG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2) #endif -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) #ifndef CFG_SYS_UDELAY_BASE # error "uDelay base not defined!" #endif @@ -111,7 +111,7 @@ ulong get_timer(ulong base) return (timestamp - base); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ /* * This function is derived from PowerPC code (read timebase as long long). diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README index 5d5c5e7adf9..34f05f3fdc7 100644 --- a/board/freescale/m53017evb/README +++ b/board/freescale/m53017evb/README @@ -87,7 +87,7 @@ CONFIG_SYS_FEC0_PINMUX -- Set FEC0 Pin configuration CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop -CFG_MCFTMR -- define to use DMA timer +CONFIG_MCFTMR -- define to use DMA timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README index e8bf75f4fb9..7240648796b 100644 --- a/board/freescale/m5373evb/README +++ b/board/freescale/m5373evb/README @@ -86,7 +86,7 @@ CONFIG_SYS_FEC0_PINMUX -- Set FEC0 Pin configuration CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop -CFG_MCFTMR -- define to use DMA timer +CONFIG_MCFTMR -- define to use DMA timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 4b89f31209a..d4c1e066884 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -111,6 +111,5 @@ #define CFG_SYS_CS0_MASK 0x007F0001 #define CFG_SYS_CS0_CTRL 0x00001FA0 -#define CFG_MCFTMR #endif /* _M5208EVBE_H */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 14d46178116..e5428183400 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -130,6 +130,5 @@ # define CFG_SYS_CS0_CTRL 0x00001D80 #endif -#define CFG_MCFTMR #endif /* _M5329EVB_H */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index b24042328d3..2f4743ce50c 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -120,6 +120,5 @@ #define CFG_SYS_GPIO1_OUT 0x00c70000 /* Set outputs to default state */ #define CFG_SYS_GPIO1_LED 0x00400000 /* user led */ -#define CFG_MCFTMR #endif /* M5249 */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 008c7257c43..0ff0bfce90b 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -132,6 +132,5 @@ #define CFG_SYS_GPIO1_OUT 0x00c70000 /* Set outputs to default state */ #define CFG_SYS_GPIO1_LED 0x00400000 /* user led */ -#define CFG_MCFTMR #endif /* _M5253DEMO_H */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 49cf3e878ea..98a17181a41 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -107,6 +107,5 @@ #define CFG_SYS_PBDAT 0x0000 #define CFG_SYS_PDCNT 0x00000000 -#define CFG_MCFTMR #endif /* _M5272C3_H */ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 965327d759d..77ddf717643 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -116,6 +116,5 @@ #define CFG_SYS_CS1_CTRL 0x00001900 #define CFG_SYS_CS1_MASK 0x00070001 -#define CFG_MCFTMR #endif /* _M5275EVB_H */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index f04d9b1b2ab..e289a23b800 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -127,6 +127,5 @@ #define CFG_SYS_DDRUA 0x05 #define CFG_SYS_PJPAR 0xFF -#define CFG_MCFTMR #endif /* _CONFIG_M5282EVB_H */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 04c456ff9f1..dcc5701ee0b 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -132,6 +132,5 @@ #define CFG_SYS_CS1_MASK 0x00070001 #define CFG_SYS_CS1_CTRL 0x00001FA0 -#define CFG_MCFTMR #endif /* _M53017EVB_H */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 0aa1ffd4d4f..dd5d4c98023 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -138,6 +138,5 @@ #define CFG_SYS_CS2_CTRL 0x00001f60 #endif -#define CFG_MCFTMR #endif /* _M5329EVB_H */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 8b9e65de98c..4bb99487509 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -136,6 +136,5 @@ #define CFG_SYS_CS2_MASK (16 << 20) #define CFG_SYS_CS2_CTRL 0x00001f60 -#define CFG_MCFTMR #endif /* _M5373EVB_H */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index ca8d17bfd2c..4c695fb9df9 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -10,7 +10,6 @@ #define CFG_SYS_UART_PORT 0 -#define CFG_MCFTMR #define CFG_SYS_UART_PORT 0 #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 80f8c4129f5..f3bfefa835e 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -184,6 +184,5 @@ #define CFG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ CF_CACR_DCM_P) -#define CFG_MCFTMR #endif /* _CONFIG_ASTRO_MCF5373L_H */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 276ecc30ccc..556705fb09f 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -184,6 +184,5 @@ configuration */ #define CFG_SYS_PBDAT 0x0000 /* PortB value reg. */ #define CFG_SYS_PDCNT 0x00000000 /* PortD control reg. */ -#define CFG_MCFTMR #endif /* _CONFIG_COBRA5272_H */ diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 9503ab66f0f..e2c9d9c43ce 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -138,7 +138,6 @@ #define CFG_SYS_DDRUA 0x05 #define CFG_SYS_PJPAR 0xFF -#define CFG_MCFTMR #endif /* _CONFIG_M5282EVB_H */ /*---------------------------------------------------------------------*/ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 05de376f0e6..ffc47c80762 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -95,6 +95,5 @@ #define CACR_STATUS (CFG_SYS_INIT_RAM_ADDR + \ CFG_SYS_INIT_RAM_SIZE - 12) -#define CFG_MCFTMR #endif /* __STMARK2_CONFIG_H */ -- 2.39.2

3 4

Pull request for efi-2023.04-rc5
by Heinrich Schuchardt 25 Mar '23

25 Mar '23

Dear Tom, The following changes since commit 78f67f11a9920ef988cbff5341616695c3e87ebd: Merge branch 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi (2023-03-24 17:00:41 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023.04-rc5 for you to fetch changes up to 180b7118bed8433f9cfe4b5ad62c6b0d901924f5: efi_loader: fix device-path for USB devices (2023-03-25 10:43:50 +0100) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/15733 ---------------------------------------------------------------- Pull request for efi-2023.04-rc5 UEFI: * Create unique device paths for USB devices with the same vendor and product id. ---------------------------------------------------------------- Heinrich Schuchardt (2): efi_loader: support for Ctrl() device path node efi_loader: fix device-path for USB devices include/efi_api.h | 6 +++++ lib/efi_loader/efi_device_path.c | 45 +++++++++++++++++++++++--------- lib/efi_loader/efi_device_path_to_text.c | 7 +++++ 3 files changed, 46 insertions(+), 12 deletions(-)

2 1

Please pull u-boot-marvell/next
by Stefan Roese 25 Mar '23

25 Mar '23

Hi Tom, please pull the following Marvell MVEBU related patches into next: ---------------------------------------------------------------- - mvebu: kwboot: Fix UART booting (Pali) - mvebu: doc: Misc updates / fixes (Pali) - kirkwood: Early init enhancements, e.g. for DEBUG UART (Pali & Tony) - mvebu: Enable NAND flash for Thecus N2350 board (Tony) - mvebu: Set common SPI flash default speed and mode (Tony) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=289&view=results Thanks, Stefan The following changes since commit 884d626d8357853c012d535bf26c143bb7b5e6a5: Merge branch '2023-03-22-assorted-minor-code-cleanups' into next (2023-03-22 20:57:39 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git next for you to fetch changes up to 66cf977716e7118819801482d0a9566661120e94: tools: kwboot: Document information about NOR XIP (2023-03-24 13:13:57 +0100) ---------------------------------------------------------------- Pali Rohár (9): doc/kwboot.1: Update Armada 38x BootROM bug description arm: kirkwood: Move internal registers in arch_very_early_init() function ddr: marvell: a38x: Remove unused file seq_exec.h tools: kwbimage: Fix invalid UART kwbimage v1 headersz tools: kwboot: Fix invalid UART kwbimage v1 headersz tools: kwboot: Fix inserting UART data checksum without -B option tools: kwboot: Fix sending very small images tools: kwboot: Workaround A38x BootROM bug for images with a gap tools: kwboot: Document information about NOR XIP Tony Dinh (3): arm: mvebu: Enable NAND flash for Thecus N2350 board arm: mvebu: Set common SPI flash default speed and mode arm: kirkwood: Enable Debug UART for Zyxel NSA310S arch/arm/mach-kirkwood/Kconfig | 2 ++ arch/arm/mach-kirkwood/Makefile | 1 + arch/arm/mach-kirkwood/cpu.c | 3 -- arch/arm/mach-kirkwood/lowlevel.S | 12 +++++++ arch/arm/mach-mvebu/Kconfig | 10 ++++++ configs/n2350_defconfig | 3 ++ configs/nsa310s_defconfig | 4 +++ doc/kwboot.1 | 2 +- drivers/ddr/marvell/a38x/ddr3_init.h | 1 - drivers/ddr/marvell/a38x/seq_exec.h | 64 ------------------------------------ tools/kwbimage.c | 10 ++++++ tools/kwboot.c | 42 ++++++++++++++++++++++- 12 files changed, 84 insertions(+), 70 deletions(-) create mode 100644 arch/arm/mach-kirkwood/lowlevel.S delete mode 100644 drivers/ddr/marvell/a38x/seq_exec.h

2 1

Pull request: rpi-2023.04
by Peter Robinson 25 Mar '23

25 Mar '23

Hi Tom, Please pull the updates for the Raspberry Pi: - Fixes for booting newer revs of the SoC in the Raspberry Pi 4 - Propagate some firmware DT properties to the loaded DT - Update the Zero2W upstream DT name These would be useful to get into the 2023.04 release as they fix some issues with using U-Boot on the newer revs of the RPi4, I've tested all of them across most of the devices in Fedora. Note this is my first PR so let me know if I've done something wrong or could improve things next time. Regards, Peter The following changes since commit 88e08fc5f6e508eac46cd1dfb0379b11ae032c0a: Prepare v2023.04-rc4 (2023-03-13 20:52:48 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-raspberrypi/ rpi-2023.04 for you to fetch changes up to 85bdd28d2bb0827f311913e00e4e338f8e4e6565: mmc: bcm2835-host: let firmware manage the clock divisor (2023-03-24 14:43:20 +0000) ---------------------------------------------------------------- Antoine Mazeas (2): rpi: Copy properties from firmware dtb to the loaded dtb rpi: Copy eth PHY address from fw DT to loaded DT Peter Robinson (1): rpi: Update the RPi Zero 2W DT filename Vincent Fazio (2): arm: rpi: fallback to max clock rate for MMC clock mmc: bcm2835-host: let firmware manage the clock divisor arch/arm/mach-bcm283x/include/mach/mbox.h | 18 ++++++++++++++++++ arch/arm/mach-bcm283x/include/mach/msg.h | 10 ++++++++++ arch/arm/mach-bcm283x/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- board/raspberrypi/rpi/rpi.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/mmc/bcm2835_sdhost.c | 53 ++++++++++++++++++++++++++++++++--------------------- 5 files changed, 158 insertions(+), 23 deletions(-)

2 1

[PATCH] powerpc: Suppress 'executable stack' warning at link
by Christophe Leroy 24 Mar '23

24 Mar '23

Following warning is observed at link. powerpc-linux-ld.bfd: warning: arch/powerpc/lib/reloc.o: missing .note.GNU-stack section implies executable stack powerpc-linux-ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker Add -zexecstack to KBUILD_LDFLAGS in order to suppress this warning. Reported-by: Stephane Franjou <stephane.franjou(a)csgroup.eu> Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- arch/powerpc/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 725a4f48aa..53124f4e80 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -10,7 +10,7 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \ PF_CPPFLAGS_POWERPC := $(call cc-option,-fno-ira-hoist-pressure,) PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2 -m32 $(PF_CPPFLAGS_POWERPC) -KBUILD_LDFLAGS += -m32 -melf32ppclinux +KBUILD_LDFLAGS += -m32 -melf32ppclinux -zexecstack # # When cross-compiling on NetBSD, we have to define __PPC__ or else we -- 2.39.2

2 1

[PATCH 0/5] New boards support: Qualcomm RB2 board
by Bhupesh Sharma 24 Mar '23

24 Mar '23

Add initial support for Qualcomm RB2 robotics board (see [1]). It is based on the Robotics version of the Snapdragon SM4250 Soc, i.e. QRB4210. Currently it supports standard u-boot and booting upstream linux kernel Subsequent patchset(s) will add more peripherals like USB, uSD card etc. As with the existing Snapdragon platforms, u-boot is chain-loaded in 64-bit mode via Android Boot Loader (ABL) which is an EFI application. For further details on chain-loading refer to platform specific documentation: - doc/board/qualcomm/qrb4210-rb2.rst [1]. https://www.qualcomm.com/products/internet-of-things/industrial/industrial-… Bhupesh Sharma (5): dt-bindings: clock: Import qcom,gcc-sm6115.h clocks: qcom: Add clock driver for SM6115 SoC reset: qcom: Add support for SM6115 SoC reset table pinctrl: qcom: Add pinctrl driver for SM6115 SoC board: qualcomm: Add support for QRB4210-RB2 arch/arm/dts/Makefile | 1 + arch/arm/dts/qrb4210-rb2-uboot.dtsi | 24 +++ arch/arm/dts/qrb4210-rb2.dtsi | 120 +++++++++++ arch/arm/mach-snapdragon/Kconfig | 11 + arch/arm/mach-snapdragon/Makefile | 3 + arch/arm/mach-snapdragon/clock-qrb4210-rb2.c | 110 ++++++++++ arch/arm/mach-snapdragon/clock-snapdragon.c | 1 + arch/arm/mach-snapdragon/clock-snapdragon.h | 2 + .../include/mach/sysmap-qrb4210rb2.h | 46 ++++ .../arm/mach-snapdragon/pinctrl-qrb4210-rb2.c | 59 +++++ arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 1 + arch/arm/mach-snapdragon/pinctrl-snapdragon.h | 1 + arch/arm/mach-snapdragon/sysmap-qrb4210-rb2.c | 35 +++ board/qualcomm/qrb4210-rb2/Kconfig | 15 ++ board/qualcomm/qrb4210-rb2/MAINTAINERS | 6 + board/qualcomm/qrb4210-rb2/Makefile | 6 + board/qualcomm/qrb4210-rb2/qrb4210-rb2.c | 51 +++++ board/qualcomm/qrb4210-rb2/qrb4210-rb2.its | 64 ++++++ configs/qrb4210rb2_defconfig | 56 +++++ doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/qrb4210-rb2.rst | 79 +++++++ drivers/reset/reset-qcom.c | 18 ++ include/configs/qrb4210-rb2.h | 21 ++ include/dt-bindings/clock/qcom,gcc-sm6115.h | 201 ++++++++++++++++++ 24 files changed, 932 insertions(+) create mode 100644 arch/arm/dts/qrb4210-rb2-uboot.dtsi create mode 100644 arch/arm/dts/qrb4210-rb2.dtsi create mode 100644 arch/arm/mach-snapdragon/clock-qrb4210-rb2.c create mode 100644 arch/arm/mach-snapdragon/include/mach/sysmap-qrb4210rb2.h create mode 100644 arch/arm/mach-snapdragon/pinctrl-qrb4210-rb2.c create mode 100644 arch/arm/mach-snapdragon/sysmap-qrb4210-rb2.c create mode 100644 board/qualcomm/qrb4210-rb2/Kconfig create mode 100644 board/qualcomm/qrb4210-rb2/MAINTAINERS create mode 100644 board/qualcomm/qrb4210-rb2/Makefile create mode 100644 board/qualcomm/qrb4210-rb2/qrb4210-rb2.c create mode 100644 board/qualcomm/qrb4210-rb2/qrb4210-rb2.its create mode 100644 configs/qrb4210rb2_defconfig create mode 100644 doc/board/qualcomm/qrb4210-rb2.rst create mode 100644 include/configs/qrb4210-rb2.h create mode 100644 include/dt-bindings/clock/qcom,gcc-sm6115.h -- 2.38.1

2 6

[PATCH u-boot-mvebu] tools: kwboot: Document information about NOR XIP
by Pali Rohár 24 Mar '23

24 Mar '23

Signed-off-by: Pali Rohár <pali(a)kernel.org> --- tools/kwboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 2b92966919da..db917708a8e8 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -61,7 +61,9 @@ * SPI-NOR or parallel-NOR. Despite the type name it really can be stored on * parallel-NOR and cannot be stored on other SPI devices, like SPI-NAND. * So it should have been named NOR image, not SPI image. This image type - * supports XIP - Execute In Place directly from NOR memory. + * supports XIP - Execute In Place directly from NOR memory. Destination + * address of the XIP image is set to 0xFFFFFFFF and execute address to the + * absolute offset in bytes from the beginning of NOR memory. * * - IBR_HDR_NAND_ID (0x8B): * NAND image can be stored either at any 2 MB aligned offset in the first -- 2.20.1

2 2

[PATCH u-boot-mvebu 0/5] mvebu: Fix UART booting
by Pali Rohár 24 Mar '23

24 Mar '23

This patch series contains kwboot fixes for booting non-UART-generated images over UART. Pali Rohár (5): tools: kwbimage: Fix invalid UART kwbimage v1 headersz tools: kwboot: Fix invalid UART kwbimage v1 headersz tools: kwboot: Fix inserting UART data checksum without -B option tools: kwboot: Fix sending very small images tools: kwboot: Workaround A38x BootROM bug for images with a gap tools/kwbimage.c | 10 ++++++++++ tools/kwboot.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) -- 2.20.1

3 12

[PATCH u-boot-mvebu] ddr: marvell: a38x: Remove unused file seq_exec.h
by Pali Rohár 24 Mar '23

24 Mar '23

DDR code does not use seq_exec.h, so remove it. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- drivers/ddr/marvell/a38x/ddr3_init.h | 1 - drivers/ddr/marvell/a38x/seq_exec.h | 64 ---------------------------- 2 files changed, 65 deletions(-) delete mode 100644 drivers/ddr/marvell/a38x/seq_exec.h diff --git a/drivers/ddr/marvell/a38x/ddr3_init.h b/drivers/ddr/marvell/a38x/ddr3_init.h index 055516b67e9c..f41a732e9a37 100644 --- a/drivers/ddr/marvell/a38x/ddr3_init.h +++ b/drivers/ddr/marvell/a38x/ddr3_init.h @@ -9,7 +9,6 @@ #include "ddr_ml_wrapper.h" #include "mv_ddr_plat.h" -#include "seq_exec.h" #include "ddr3_logging_def.h" #include "ddr3_training_hw_algo.h" #include "ddr3_training_ip.h" diff --git a/drivers/ddr/marvell/a38x/seq_exec.h b/drivers/ddr/marvell/a38x/seq_exec.h deleted file mode 100644 index fe0cb8f75df2..000000000000 -- 2.20.1

2 2

[PATCH] arm: kirkwood: Enable Debug UART for Zyxel NSA310S
by Tony Dinh 24 Mar '23

24 Mar '23

It's useful to enable Debug UART for future DM Serial regression tests for Kirkwood boards. Also, see background discussion in this thread: https://lists.denx.de/pipermail/u-boot/2023-March/512010.html Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- configs/nsa310s_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 76839e62dd..b936ae1b25 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -15,8 +15,11 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310s" CONFIG_SYS_PROMPT="NSA310s> " +CONFIG_DEBUG_UART_BASE=0xf1012000 +CONFIG_DEBUG_UART_CLOCK=166666667 CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server" CONFIG_SYS_LOAD_ADDR=0x800000 +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y @@ -50,6 +53,7 @@ CONFIG_MTD_RAW_NAND=y CONFIG_PHY_MARVELL=y CONFIG_MVGBE=y CONFIG_MII=y +CONFIG_DEBUG_UART_SHIFT=2 CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_UBIFS_SILENCE_MSG=y -- 2.30.2

3 3