[PATCH 00/15] rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI

John Clark inindev at gmail.com
Sat Feb 10 02:15:10 CET 2024


On 2/6/24 7:02 PM, Jonas Karlman wrote:
> This series contains miscellaneous updates to defconfigs, syncs latest
> device trees from linux, fixes an issue loading FIT from SD-card when
> running SPL from eMMC and enables building a bootable SPI image on
> RK3328 boards.
>
> I am also adding myself as a reviewer for the three RK3328 boards I own.
>
> Patch 1-7 updates boards to enable similar Kconfig options and use a
> common order for from where to try and load FIT.
>
> Patch 8 fix loading FIT from SD-card when booting from eMMC by using
> pinctrl for emmc and sdmmc in SPL.
>
> Patch 9-10 makes rockchip gpio and rng driver compatible with linux.
>
> Patch 11 sync latest rk3328 device tree files from linux v6.8-rc1.
>
> Patch 12 reverts an old commit that added duplicated code.
>
> Patch 13-15 enables building u-boot-rockchip-spi.bin for boards with
> SPI flash.
>
> This series depends on the "rockchip: Fix ethernet on Radxa ROCK Pi E
> v1.21" series at [1].
>
> [1] https://patchwork.ozlabs.org/cover/1887729/
>
> Jonas Karlman (15):
>    rockchip: rk3328: Update default u-boot,spl-boot-order prop
>    rockchip: rk3328-evb: Update defconfig
>    rockchip: rk3328-rock64: Update defconfig
>    rockchip: rk3328-roc-cc: Update defconfig
>    rockchip: rk3328-rock-pi-e: Update defconfig
>    rockchip: rk3328-nanopi-r2: Update defconfig
>    rockchip: rk3328-orangepi-r1-plus: Update defconfig
>    rockchip: rk3328: Fix loading FIT from SD-card when booting from eMMC
>    gpio: rockchip: Use gpio alias id as gpio bank id
>    rng: rockchip: Use same compatible as linux
>    rockchip: rk3328: Sync device tree from linux v6.8-rc1
>    Revert "rockchip: Allow booting from SPI"
>    rockchip: rk3328: Add support to build bootable SPI image
>    rockchip: rk3328-rock64: Enable boot from SPI NOR flash
>    rockchip: rk3328-orangepi-r1-plus: Enable boot from SPI NOR flash
>
>   arch/arm/dts/rk3328-evb-u-boot.dtsi           |  4 +
>   arch/arm/dts/rk3328-evb.dts                   |  1 +
>   .../dts/rk3328-nanopi-r2c-plus-u-boot.dtsi    |  6 --
>   arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi    | 28 ------
>   arch/arm/dts/rk3328-nanopi-r2s.dts            |  3 +-
>   .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi   | 36 ++-----
>   arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts  |  4 +-
>   .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi   | 36 ++-----
>   arch/arm/dts/rk3328-orangepi-r1-plus.dts      |  1 +
>   arch/arm/dts/rk3328-roc-cc-u-boot.dtsi        | 22 +----
>   arch/arm/dts/rk3328-roc-cc.dts                |  3 +-
>   arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi     | 17 ----
>   arch/arm/dts/rk3328-rock-pi-e.dts             | 55 +++++++++++
>   arch/arm/dts/rk3328-rock64-u-boot.dtsi        | 30 ++----
>   arch/arm/dts/rk3328-rock64.dts                |  1 +
>   arch/arm/dts/rk3328-u-boot.dtsi               | 99 +++++++++++++++----
>   arch/arm/dts/rk3328.dtsi                      | 64 +++++++++---
>   arch/arm/dts/rk3399-u-boot.dtsi               |  2 +-
>   arch/arm/mach-rockchip/rk3328/rk3328.c        |  1 +
>   arch/arm/mach-rockchip/spl-boot-order.c       |  3 -
>   board/rockchip/evb_rk3328/MAINTAINERS         | 11 +++
>   board/rockchip/evb_rk3328/README              | 70 -------------
>   configs/evb-rk3328_defconfig                  | 16 ++-
>   configs/nanopi-r2c-plus-rk3328_defconfig      | 11 ++-
>   configs/nanopi-r2c-rk3328_defconfig           | 11 ++-
>   configs/nanopi-r2s-rk3328_defconfig           | 11 ++-
>   configs/orangepi-r1-plus-lts-rk3328_defconfig | 20 +++-
>   configs/orangepi-r1-plus-rk3328_defconfig     | 20 +++-
>   configs/roc-cc-rk3328_defconfig               |  9 +-
>   configs/rock-pi-e-rk3328_defconfig            | 10 +-
>   configs/rock64-rk3328_defconfig               | 15 ++-
>   doc/board/rockchip/rockchip.rst               |  9 +-
>   drivers/gpio/rk_gpio.c                        |  7 +-
>   drivers/rng/rockchip_rng.c                    | 10 +-
>   34 files changed, 351 insertions(+), 295 deletions(-)
>   delete mode 100644 board/rockchip/evb_rk3328/README
>
nice cleanup, great work




More information about the U-Boot mailing list