[PATCH 00/31] rockchip: rk3399: Sync DT with linux v6.8 and update defconfigs

Jonas Karlman jonas at kwiboo.se
Mon Apr 1 12:01:46 CEST 2024


On 2024-04-01 11:45, Jonas Karlman wrote:
> Hi Sumit,
> 
> On 2024-04-01 10:52, Sumit Garg wrote:
>> Hi Jonas,
>>
>> On Mon, 1 Apr 2024 at 01:59, Jonas Karlman <jonas at kwiboo.se> wrote:
>>>
>>> This series adds support for new clocks used in linux v6.8 device trees,
>>> enables use of FIT signature check for checksum validation and fixes
>>> loading FIT from SD-card when loading FIT from eMMC fails.
>>>
>>> After this series it should be possible to move RK3399 boards to use
>>> OF_UPSTREAM in a future patch once dts/upstream move to a v6.8+ tag.
>>>
>>
>> Thanks for putting this effort together. A switch to v6.8 tag for
>> OF_UPSTREAM will happen as part of patch [1]. So if you want to save
>> further effort then you can just rebase with a switch to OF_UPSTREAM
>> once that patch [1] lands in next.
> 
> Because this is a jump of device tree files from v5.14-rc1 to v6.8,
> reviewability and being able to cherry-pick these changes to my
> rk3xxx-2024.04 branch, I think it is much more appropriate to first sync
> everything to v6.8 and then in a separate series move to OF_UPSTREAM.
> Else it can be very hard to understand some of the changes that has been
> and was needed to be made to u-boot.dtsi files.

Also forgot to mention that these synced DT files still contains some
minor modification in #include dtsi paths of files that is shared
between rk3288 (armv7) and rk3399 (armv8), so a full sync of rk3288 to
linux v6.8 would be recommended before doing a full move to OF_UPSTREAM
of rk3399.

> 
> Reviewability is one of the shortcomings with a switch to OF_UPSTREAM.
> 
> Regards,
> Jonas
> 
>>
>> [1] https://lists.denx.de/pipermail/u-boot/2024-March/549611.html
>>
>> -Sumit
>>
>>> I have runtime tested this series on following devices:
>>> - 96boards Rock960
>>> - Khadas Edge Captain
>>> - Pine64 PineBook Pro
>>> - Pine64 RockPro64
>>> - Radxa ROCK 4C+
>>> - Radxa ROCK 4SE
>>> - Radxa ROCK Pi 4A
>>> - Radxa ROCK Pi 4B+
>>>
>>> This series depends on the following series:
>>> - Enable booting from SPI flash on ROCK Pi 4 [1]
>>> - rockchip: spl: Cache boot source id for later use [2]
>>>
>>> A copy of this series and all its depends can be found at [3]
>>>
>>> [1] https://patchwork.ozlabs.org/cover/1912469/
>>> [2] https://patchwork.ozlabs.org/cover/1915071/
>>> [3] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-dt-sync-v1
>>>
>>> Jonas Karlman (31):
>>>   rockchip: rk3399-gru: Fix max SPL size on bob and kevin
>>>   rockchip: rk3399-ficus: Enable TPL and use common bss and stack addr
>>>   rockchip: rk3399: Sort imply statements alphabetically
>>>   rockchip: rk3399: Enable ARMv8 crypto and FIT checksum validation
>>>   rockchip: rk3399: Enable random generator on all boards
>>>   rockchip: rk3399: Imply support for GbE PHY
>>>   rockchip: rk3399: Enable DT overlay support on all boards
>>>   rockchip: rk3399: Remove use of xPL_MISC_DRIVERS options
>>>   rockchip: rk3399: Add a default spl-boot-order prop
>>>   rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
>>>   clk: rockchip: rk3399: Rename SCLK_DDRCLK to SCLK_DDRC
>>>   clk: rockchip: rk3399: Add dummy support for ACLK_VDU clock
>>>   clk: rockchip: rk3399: Add dummy support for SCLK_PCIEPHY_REF clock
>>>   clk: rockchip: rk3399: Add SCLK_USB3OTGx_REF support
>>>   rockchip: rk3399: Sync soc device tree from linux v6.8
>>>   rockchip: rk3399-gru: Sync device tree from linux v6.8
>>>   rockchip: rk3399-puma: Sync DT from linux v6.8
>>>   rockchip: rk3399-rock-pi-n10: Sync device tree from linux v6.8
>>>   rockchip: rk3399-eaidk-610: Sync device tree from linux v6.8
>>>   rockchip: rk3399-leez: Sync device tree from linux v6.8
>>>   rockchip: rk3399-evb: Sync device tree from linux v6.8
>>>   rockchip: rk3399-firefly: Sync device tree from linux v6.8
>>>   rockchip: rk3399-orangepi: Sync device tree from linux v6.8
>>>   rockchip: rk3399-roc-pc: Sync device tree from linux v6.8
>>>   rockchip: rk3399-nanopi-4: Sync device tree from linux v6.8
>>>   rockchip: rk3399-rock960: Sync device tree from linux v6.8
>>>   rockchip: rk3399-khadas: Sync device tree from linux v6.8
>>>   rockchip: rk3399-rock-pi-4: Sync device tree from linux v6.8
>>>   rockchip: rk3399-rockpro64: Sync device tree from linux v6.8
>>>   rockchip: rk3399-pinebook-pro: Sync device tree from linux v6.8
>>>   rockchip: rk3399-pinephone-pro: Sync device tree from linux v6.8
>>>
>>>  arch/arm/dts/rk3288-vmarc-som.dtsi            |  48 +++
>>>  arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi     |   1 -
>>>  arch/arm/dts/rk3399-eaidk-610.dts             |   3 +-
>>>  arch/arm/dts/rk3399-evb-u-boot.dtsi           |  13 +-
>>>  arch/arm/dts/rk3399-evb.dts                   |   3 +-
>>>  arch/arm/dts/rk3399-ficus-u-boot.dtsi         |  10 +-
>>>  arch/arm/dts/rk3399-ficus.dts                 |   4 +
>>>  arch/arm/dts/rk3399-firefly-u-boot.dtsi       |   6 -
>>>  arch/arm/dts/rk3399-firefly.dts               |  17 +-
>>>  arch/arm/dts/rk3399-gru-bob.dts               |   8 +-
>>>  arch/arm/dts/rk3399-gru-chromebook.dtsi       | 200 +++++++++++-
>>>  arch/arm/dts/rk3399-gru-kevin.dts             |   3 +-
>>>  arch/arm/dts/rk3399-gru-u-boot.dtsi           |  34 ++-
>>>  arch/arm/dts/rk3399-gru.dtsi                  |  52 +++-
>>>  arch/arm/dts/rk3399-khadas-edge-captain.dts   |   4 +
>>>  arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi   |   7 +-
>>>  arch/arm/dts/rk3399-khadas-edge-v.dts         |   4 +
>>>  arch/arm/dts/rk3399-khadas-edge.dtsi          |  10 +-
>>>  arch/arm/dts/rk3399-leez-p710-u-boot.dtsi     |   6 -
>>>  arch/arm/dts/rk3399-leez-p710.dts             |   8 +-
>>>  arch/arm/dts/rk3399-nanopc-t4.dts             |   2 +-
>>>  arch/arm/dts/rk3399-nanopi-m4-2gb.dts         |  55 +---
>>>  arch/arm/dts/rk3399-nanopi-m4b.dts            |   2 +-
>>>  arch/arm/dts/rk3399-nanopi-r4s.dts            |   4 +-
>>>  arch/arm/dts/rk3399-nanopi4-u-boot.dtsi       |  18 +-
>>>  arch/arm/dts/rk3399-nanopi4.dtsi              |   7 +-
>>>  arch/arm/dts/rk3399-op1-opp.dtsi              |  31 +-
>>>  arch/arm/dts/rk3399-opp.dtsi                  |   6 +-
>>>  arch/arm/dts/rk3399-orangepi-u-boot.dtsi      |  12 +
>>>  arch/arm/dts/rk3399-orangepi.dts              |  12 +-
>>>  arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi  |  23 +-
>>>  arch/arm/dts/rk3399-pinebook-pro.dts          |  24 +-
>>>  arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi |  24 +-
>>>  arch/arm/dts/rk3399-pinephone-pro.dts         | 147 +++++++++
>>>  arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi   |  27 +-
>>>  arch/arm/dts/rk3399-puma-haikou.dts           |  42 ++-
>>>  arch/arm/dts/rk3399-puma.dtsi                 |  17 +-
>>>  arch/arm/dts/rk3399-roc-pc-u-boot.dtsi        |  45 +--
>>>  arch/arm/dts/rk3399-roc-pc.dtsi               |  15 +-
>>>  arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi  |  20 ++
>>>  arch/arm/dts/rk3399-rock-4c-plus.dts          |   1 +
>>>  arch/arm/dts/rk3399-rock-4se-u-boot.dtsi      |  12 +
>>>  arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi     |   6 -
>>>  arch/arm/dts/rk3399-rock-pi-4.dtsi            |   4 +-
>>>  arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi    |   7 +
>>>  arch/arm/dts/rk3399-rock-pi-4c.dts            |  10 +
>>>  arch/arm/dts/rk3399-rock960-u-boot.dtsi       |  11 +-
>>>  arch/arm/dts/rk3399-rock960.dtsi              |   5 +-
>>>  arch/arm/dts/rk3399-rockpro64-u-boot.dtsi     |  22 +-
>>>  arch/arm/dts/rk3399-rockpro64.dtsi            |  98 +++++-
>>>  arch/arm/dts/rk3399-u-boot.dtsi               | 129 +++++---
>>>  arch/arm/dts/rk3399.dtsi                      | 289 ++++++++++++++++--
>>>  .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi |   6 -
>>>  arch/arm/dts/rk3399pro-vmarc-som.dtsi         |  20 +-
>>>  .../dts/rockchip-radxa-dalang-carrier.dtsi    |  21 ++
>>>  arch/arm/mach-rockchip/Kconfig                |  38 ++-
>>>  configs/chromebook_bob_defconfig              |   6 +-
>>>  configs/chromebook_kevin_defconfig            |   6 +-
>>>  configs/eaidk-610-rk3399_defconfig            |  13 +-
>>>  configs/evb-rk3399_defconfig                  |  10 +-
>>>  configs/ficus-rk3399_defconfig                |  38 +--
>>>  configs/firefly-rk3399_defconfig              |  17 +-
>>>  configs/khadas-edge-captain-rk3399_defconfig  |  35 ++-
>>>  configs/khadas-edge-rk3399_defconfig          |  29 +-
>>>  configs/khadas-edge-v-rk3399_defconfig        |  35 ++-
>>>  configs/leez-rk3399_defconfig                 |  13 +-
>>>  configs/nanopc-t4-rk3399_defconfig            |  18 +-
>>>  configs/nanopi-m4-2gb-rk3399_defconfig        |  22 +-
>>>  configs/nanopi-m4-rk3399_defconfig            |  22 +-
>>>  configs/nanopi-m4b-rk3399_defconfig           |  22 +-
>>>  configs/nanopi-neo4-rk3399_defconfig          |  22 +-
>>>  configs/nanopi-r4s-rk3399_defconfig           |  16 +-
>>>  configs/orangepi-rk3399_defconfig             |  14 +-
>>>  configs/pinebook-pro-rk3399_defconfig         |  13 +-
>>>  configs/pinephone-pro-rk3399_defconfig        |  13 +-
>>>  configs/puma-rk3399_defconfig                 |   5 +-
>>>  configs/roc-pc-mezzanine-rk3399_defconfig     |  15 +-
>>>  configs/roc-pc-rk3399_defconfig               |  13 +-
>>>  configs/rock-4c-plus-rk3399_defconfig         |  27 +-
>>>  configs/rock-4se-rk3399_defconfig             |  28 +-
>>>  configs/rock-pi-4-rk3399_defconfig            |  13 +-
>>>  configs/rock-pi-4c-rk3399_defconfig           |  27 +-
>>>  configs/rock-pi-n10-rk3399pro_defconfig       |  10 +-
>>>  configs/rock960-rk3399_defconfig              |  18 +-
>>>  configs/rockpro64-rk3399_defconfig            |  16 +-
>>>  drivers/clk/rockchip/clk_rk3399.c             |  12 +-
>>>  include/dt-bindings/clock/rk3399-cru.h        |  30 +-
>>>  87 files changed, 1700 insertions(+), 531 deletions(-)
>>>
>>> --
>>> 2.43.2
>>>
> 



More information about the U-Boot mailing list