mbox series

Pull request: u-boot-sunxi/master for v2024.04

Message ID 20240129155543.2439451-1-andre.przywara@arm.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Pull request: u-boot-sunxi/master for v2024.04 | expand

Pull-request

https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master

Message

Andre Przywara Jan. 29, 2024, 3:55 p.m. UTC
Hi Tom,

please pull the sunxi/master branch, containing the first part of the
2024.04 changes. I had some more (USB regulator) changes queued, but
found regressions during the final testing, so had to drop some. If I
can find reasons and simple fixes for those, I would send them later.

So for now these are some rather easy changes:
- Some cleanups in header files: those do not affect the generated
binaries at all.
- The usual update of DT files from the kernel repo, mostly adding new
board files this time. On the wake of this there is one defconfig to
enable a new board, some H618 TV box branded as "Transpeed".
- Samuel's series to support SPL FIT image loading for 32-bit SoCs as
well, so far this was restricted to ARM64 boards. I refrained from
automatically enabling this everywhere, instead this requires user
intervention during board configuration. This allows to ship the "crust"
management processor firmware on H3 boards, which enables better power
saving.
- One defconfig for an older H3 board. There was a close-by defconfig for
a related board, but there are some differences which deserve a separate
file.
- Support for the EMAC driver to work with fixed-link PHYs, which allows
to directly wire the MAC to a switch IC.

The branch survived build testing for all 167 sunxi boards, and Linux
boot testing on some selected boards.

Please pull!

Cheers,
Andre

==================
The following changes since commit 526a865fe4fea59fb2638726c26e39557eb97fdd:

  Merge branch 'master-cleanup' of https://source.denx.de/u-boot/custodians/u-boot-sh (2024-01-27 20:43:20 -0500)

are available in the Git repository at:

  https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master

for you to fetch changes up to 539612e27690a8df7f197cd1e9f4c2cf6ee1ac64:

  sunxi: Consider SPL size limitations for FIT loading (2024-01-29 14:31:00 +0000)

----------------------------------------------------------------
Andre Przywara (7):
      sunxi: cleanup sunxi-common.h
      sunxi: sun50i-h6: remove unneeded base addresses from header
      sunxi: sun4i: remove unneeded base addresses from header
      sunxi: sun9i: remove unneeded base addresses from header
      sunxi: remove common.h inclusion
      sunxi: simplify U-Boot proper only builds
      sunxi: dts: update devicetree files from Linux-v6.8-rc1

Chuanhong Guo (1):
      sunxi: add defconfig for nanopi_duo2

Maksim Kiselev (1):
      net: sun8i-emac: Add support for fixed-link phy

Nick Alilovic (1):
      sunxi: add Transpeed 8K618-T board support

Samuel Holland (4):
      sunxi: spl: Disable padding from SPL_PAD_TO
      sunxi: binman: Move BL31 and SCP firmware addresses to Kconfig
      sunxi: binman: Support FIT generation for 32-bit SoCs
      sunxi: Consider SPL size limitations for FIT loading

 arch/arm/Kconfig                                   |   4 +-
 arch/arm/dts/Makefile                              |   1 +
 arch/arm/dts/sun50i-h616-bigtreetech-cb1-manta.dts |  35 +++
 arch/arm/dts/sun50i-h616-bigtreetech-cb1.dtsi      | 138 +++++++++++
 arch/arm/dts/sun50i-h616-bigtreetech-pi.dts        |  63 +++++
 arch/arm/dts/sun50i-h616.dtsi                      |   7 +
 arch/arm/dts/sun50i-h618-orangepi-zero2w.dts       | 176 +++++++++++++
 arch/arm/dts/sun50i-h618-transpeed-8k618-t.dts     | 161 ++++++++++++
 arch/arm/dts/sun8i-r40.dtsi                        |   2 +
 arch/arm/dts/sun8i-v3s-anbernic-rg-nano.dts        | 276 +++++++++++++++++++++
 arch/arm/dts/sun8i-v3s.dtsi                        |  35 +++
 arch/arm/dts/sunxi-u-boot.dtsi                     |  41 +--
 arch/arm/include/asm/arch-sunxi/cpu_sun4i.h        |  47 ----
 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h    |  21 --
 arch/arm/include/asm/arch-sunxi/cpu_sun9i.h        |  41 ---
 arch/arm/mach-sunxi/Kconfig                        |  33 ++-
 arch/arm/mach-sunxi/board.c                        |   1 -
 arch/arm/mach-sunxi/clock.c                        |   1 -
 arch/arm/mach-sunxi/clock_sun4i.c                  |   1 -
 arch/arm/mach-sunxi/clock_sun50i_h6.c              |   1 -
 arch/arm/mach-sunxi/clock_sun6i.c                  |   1 -
 arch/arm/mach-sunxi/clock_sun8i_a83t.c             |   1 -
 arch/arm/mach-sunxi/clock_sun9i.c                  |   1 -
 arch/arm/mach-sunxi/cpu_info.c                     |   1 -
 arch/arm/mach-sunxi/dram_helpers.c                 |   3 +-
 arch/arm/mach-sunxi/dram_sun4i.c                   |   1 -
 arch/arm/mach-sunxi/dram_sun50i_h6.c               |   1 -
 arch/arm/mach-sunxi/dram_sun50i_h616.c             |   1 -
 arch/arm/mach-sunxi/dram_sun6i.c                   |   1 -
 arch/arm/mach-sunxi/dram_sun8i_a23.c               |   1 -
 arch/arm/mach-sunxi/dram_sun8i_a33.c               |   1 -
 arch/arm/mach-sunxi/dram_sun8i_a83t.c              |   1 -
 arch/arm/mach-sunxi/dram_sun9i.c                   |   1 -
 arch/arm/mach-sunxi/dram_suniv.c                   |   2 +-
 arch/arm/mach-sunxi/dram_sunxi_dw.c                |   1 -
 arch/arm/mach-sunxi/gtbus_sun9i.c                  |   1 -
 arch/arm/mach-sunxi/pmic_bus.c                     |   1 -
 arch/arm/mach-sunxi/prcm.c                         |   1 -
 arch/arm/mach-sunxi/spl_spi_sunxi.c                |   1 -
 arch/arm/mach-sunxi/timer.c                        |   1 -
 common/spl/Kconfig                                 |   6 +-
 configs/nanopi_duo2_defconfig                      |  12 +
 configs/transpeed-8k618-t_defconfig                |  27 ++
 drivers/net/sun8i_emac.c                           |   7 +-
 include/configs/sunxi-common.h                     |  56 +----
 45 files changed, 1002 insertions(+), 214 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-cb1-manta.dts
 create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-cb1.dtsi
 create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-pi.dts
 create mode 100644 arch/arm/dts/sun50i-h618-orangepi-zero2w.dts
 create mode 100644 arch/arm/dts/sun50i-h618-transpeed-8k618-t.dts
 create mode 100644 arch/arm/dts/sun8i-v3s-anbernic-rg-nano.dts
 create mode 100644 configs/nanopi_duo2_defconfig
 create mode 100644 configs/transpeed-8k618-t_defconfig

Comments

Andre Przywara Jan. 29, 2024, 5:24 p.m. UTC | #1
On Mon, 29 Jan 2024 15:55:43 +0000
Andre Przywara <andre.przywara@arm.com> wrote:

Hi Tom,

> please pull the sunxi/master branch, containing the first part of the

I just saw that the CI pipeline failed on missing maintainer entries for
the two new boards. Is that a showstopper for you? Shall I update the
branch, or would a follow-up patch be sufficient?

Cheers,
Andre

> 2024.04 changes. I had some more (USB regulator) changes queued, but
> found regressions during the final testing, so had to drop some. If I
> can find reasons and simple fixes for those, I would send them later.
> 
> So for now these are some rather easy changes:
> - Some cleanups in header files: those do not affect the generated
> binaries at all.
> - The usual update of DT files from the kernel repo, mostly adding new
> board files this time. On the wake of this there is one defconfig to
> enable a new board, some H618 TV box branded as "Transpeed".
> - Samuel's series to support SPL FIT image loading for 32-bit SoCs as
> well, so far this was restricted to ARM64 boards. I refrained from
> automatically enabling this everywhere, instead this requires user
> intervention during board configuration. This allows to ship the "crust"
> management processor firmware on H3 boards, which enables better power
> saving.
> - One defconfig for an older H3 board. There was a close-by defconfig for
> a related board, but there are some differences which deserve a separate
> file.
> - Support for the EMAC driver to work with fixed-link PHYs, which allows
> to directly wire the MAC to a switch IC.
> 
> The branch survived build testing for all 167 sunxi boards, and Linux
> boot testing on some selected boards.
> 
> Please pull!
> 
> Cheers,
> Andre
> 
> ==================
> The following changes since commit 526a865fe4fea59fb2638726c26e39557eb97fdd:
> 
>   Merge branch 'master-cleanup' of https://source.denx.de/u-boot/custodians/u-boot-sh (2024-01-27 20:43:20 -0500)
> 
> are available in the Git repository at:
> 
>   https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master
> 
> for you to fetch changes up to 539612e27690a8df7f197cd1e9f4c2cf6ee1ac64:
> 
>   sunxi: Consider SPL size limitations for FIT loading (2024-01-29 14:31:00 +0000)
> 
> ----------------------------------------------------------------
> Andre Przywara (7):
>       sunxi: cleanup sunxi-common.h
>       sunxi: sun50i-h6: remove unneeded base addresses from header
>       sunxi: sun4i: remove unneeded base addresses from header
>       sunxi: sun9i: remove unneeded base addresses from header
>       sunxi: remove common.h inclusion
>       sunxi: simplify U-Boot proper only builds
>       sunxi: dts: update devicetree files from Linux-v6.8-rc1
> 
> Chuanhong Guo (1):
>       sunxi: add defconfig for nanopi_duo2
> 
> Maksim Kiselev (1):
>       net: sun8i-emac: Add support for fixed-link phy
> 
> Nick Alilovic (1):
>       sunxi: add Transpeed 8K618-T board support
> 
> Samuel Holland (4):
>       sunxi: spl: Disable padding from SPL_PAD_TO
>       sunxi: binman: Move BL31 and SCP firmware addresses to Kconfig
>       sunxi: binman: Support FIT generation for 32-bit SoCs
>       sunxi: Consider SPL size limitations for FIT loading
> 
>  arch/arm/Kconfig                                   |   4 +-
>  arch/arm/dts/Makefile                              |   1 +
>  arch/arm/dts/sun50i-h616-bigtreetech-cb1-manta.dts |  35 +++
>  arch/arm/dts/sun50i-h616-bigtreetech-cb1.dtsi      | 138 +++++++++++
>  arch/arm/dts/sun50i-h616-bigtreetech-pi.dts        |  63 +++++
>  arch/arm/dts/sun50i-h616.dtsi                      |   7 +
>  arch/arm/dts/sun50i-h618-orangepi-zero2w.dts       | 176 +++++++++++++
>  arch/arm/dts/sun50i-h618-transpeed-8k618-t.dts     | 161 ++++++++++++
>  arch/arm/dts/sun8i-r40.dtsi                        |   2 +
>  arch/arm/dts/sun8i-v3s-anbernic-rg-nano.dts        | 276 +++++++++++++++++++++
>  arch/arm/dts/sun8i-v3s.dtsi                        |  35 +++
>  arch/arm/dts/sunxi-u-boot.dtsi                     |  41 +--
>  arch/arm/include/asm/arch-sunxi/cpu_sun4i.h        |  47 ----
>  arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h    |  21 --
>  arch/arm/include/asm/arch-sunxi/cpu_sun9i.h        |  41 ---
>  arch/arm/mach-sunxi/Kconfig                        |  33 ++-
>  arch/arm/mach-sunxi/board.c                        |   1 -
>  arch/arm/mach-sunxi/clock.c                        |   1 -
>  arch/arm/mach-sunxi/clock_sun4i.c                  |   1 -
>  arch/arm/mach-sunxi/clock_sun50i_h6.c              |   1 -
>  arch/arm/mach-sunxi/clock_sun6i.c                  |   1 -
>  arch/arm/mach-sunxi/clock_sun8i_a83t.c             |   1 -
>  arch/arm/mach-sunxi/clock_sun9i.c                  |   1 -
>  arch/arm/mach-sunxi/cpu_info.c                     |   1 -
>  arch/arm/mach-sunxi/dram_helpers.c                 |   3 +-
>  arch/arm/mach-sunxi/dram_sun4i.c                   |   1 -
>  arch/arm/mach-sunxi/dram_sun50i_h6.c               |   1 -
>  arch/arm/mach-sunxi/dram_sun50i_h616.c             |   1 -
>  arch/arm/mach-sunxi/dram_sun6i.c                   |   1 -
>  arch/arm/mach-sunxi/dram_sun8i_a23.c               |   1 -
>  arch/arm/mach-sunxi/dram_sun8i_a33.c               |   1 -
>  arch/arm/mach-sunxi/dram_sun8i_a83t.c              |   1 -
>  arch/arm/mach-sunxi/dram_sun9i.c                   |   1 -
>  arch/arm/mach-sunxi/dram_suniv.c                   |   2 +-
>  arch/arm/mach-sunxi/dram_sunxi_dw.c                |   1 -
>  arch/arm/mach-sunxi/gtbus_sun9i.c                  |   1 -
>  arch/arm/mach-sunxi/pmic_bus.c                     |   1 -
>  arch/arm/mach-sunxi/prcm.c                         |   1 -
>  arch/arm/mach-sunxi/spl_spi_sunxi.c                |   1 -
>  arch/arm/mach-sunxi/timer.c                        |   1 -
>  common/spl/Kconfig                                 |   6 +-
>  configs/nanopi_duo2_defconfig                      |  12 +
>  configs/transpeed-8k618-t_defconfig                |  27 ++
>  drivers/net/sun8i_emac.c                           |   7 +-
>  include/configs/sunxi-common.h                     |  56 +----
>  45 files changed, 1002 insertions(+), 214 deletions(-)
>  create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-cb1-manta.dts
>  create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-cb1.dtsi
>  create mode 100644 arch/arm/dts/sun50i-h616-bigtreetech-pi.dts
>  create mode 100644 arch/arm/dts/sun50i-h618-orangepi-zero2w.dts
>  create mode 100644 arch/arm/dts/sun50i-h618-transpeed-8k618-t.dts
>  create mode 100644 arch/arm/dts/sun8i-v3s-anbernic-rg-nano.dts
>  create mode 100644 configs/nanopi_duo2_defconfig
>  create mode 100644 configs/transpeed-8k618-t_defconfig
>
Tom Rini Jan. 29, 2024, 5:34 p.m. UTC | #2
On Mon, Jan 29, 2024 at 05:24:49PM +0000, Andre Przywara wrote:
> On Mon, 29 Jan 2024 15:55:43 +0000
> Andre Przywara <andre.przywara@arm.com> wrote:
> 
> Hi Tom,
> 
> > please pull the sunxi/master branch, containing the first part of the
> 
> I just saw that the CI pipeline failed on missing maintainer entries for
> the two new boards. Is that a showstopper for you? Shall I update the
> branch, or would a follow-up patch be sufficient?

I've fixed this up myself this time, since I was doing another CI run
with this for other changes but in the future please fix these errors
before sending the PR.
Andre Przywara Jan. 29, 2024, 5:50 p.m. UTC | #3
On Mon, 29 Jan 2024 12:34:18 -0500
Tom Rini <trini@konsulko.com> wrote:

Hi Tom,

> On Mon, Jan 29, 2024 at 05:24:49PM +0000, Andre Przywara wrote:
> > On Mon, 29 Jan 2024 15:55:43 +0000
> > Andre Przywara <andre.przywara@arm.com> wrote:
> > 
> > Hi Tom,
> >   
> > > please pull the sunxi/master branch, containing the first part of the  
> > 
> > I just saw that the CI pipeline failed on missing maintainer entries for
> > the two new boards. Is that a showstopper for you? Shall I update the
> > branch, or would a follow-up patch be sufficient?  
> 
> I've fixed this up myself this time, since I was doing another CI run
> with this for other changes but in the future please fix these errors
> before sending the PR.

Many thanks for that, and sorry about the mishap! I wanted to trigger the
CI yesterday night and send the PR this morning, but then discovered two
problems in a last minute test. So I was admittedly rushing things a bit
today. I built all sunxi boards locally, and that passed, so I didn't wait
for the CI to finish ... :-(

Sorry again!

Cheers,
Andre
Tom Rini Jan. 29, 2024, 5:55 p.m. UTC | #4
On Mon, Jan 29, 2024 at 03:55:43PM +0000, Andre Przywara wrote:

> Hi Tom,
> 
> please pull the sunxi/master branch, containing the first part of the
> 2024.04 changes. I had some more (USB regulator) changes queued, but
> found regressions during the final testing, so had to drop some. If I
> can find reasons and simple fixes for those, I would send them later.
> 
> So for now these are some rather easy changes:
> - Some cleanups in header files: those do not affect the generated
> binaries at all.
> - The usual update of DT files from the kernel repo, mostly adding new
> board files this time. On the wake of this there is one defconfig to
> enable a new board, some H618 TV box branded as "Transpeed".
> - Samuel's series to support SPL FIT image loading for 32-bit SoCs as
> well, so far this was restricted to ARM64 boards. I refrained from
> automatically enabling this everywhere, instead this requires user
> intervention during board configuration. This allows to ship the "crust"
> management processor firmware on H3 boards, which enables better power
> saving.
> - One defconfig for an older H3 board. There was a close-by defconfig for
> a related board, but there are some differences which deserve a separate
> file.
> - Support for the EMAC driver to work with fixed-link PHYs, which allows
> to directly wire the MAC to a switch IC.
> 
> The branch survived build testing for all 167 sunxi boards, and Linux
> boot testing on some selected boards.
>
> Please pull!
> 
> Cheers,
> Andre
> 
> ==================
> The following changes since commit 526a865fe4fea59fb2638726c26e39557eb97fdd:
> 
>   Merge branch 'master-cleanup' of https://source.denx.de/u-boot/custodians/u-boot-sh (2024-01-27 20:43:20 -0500)
> 
> are available in the Git repository at:
> 
>   https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master
> 
> for you to fetch changes up to 539612e27690a8df7f197cd1e9f4c2cf6ee1ac64:
> 
>   sunxi: Consider SPL size limitations for FIT loading (2024-01-29 14:31:00 +0000)
> 

Applied to u-boot/master, thanks!