[PATCH 3/6] board: puma: reorganize devicetrees to actually work and match upstream

Philipp Tomsich philipp.tomsich at theobroma-systems.com
Wed Jun 3 19:09:53 CEST 2020


> On 03.06.2020, at 16:59, Heiko Stuebner <heiko at sntech.de> wrote:
> 
> From: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
> 
> So far the puma dts files only just included the main puma dtsi without
> handling the actual baseboard and rk3399-puma.dtsi was very much
> detached from the variant in the mainline Linux kernel.
> 
> Recent changes resulted in a strange situation with nonworking puma boards.
> 
> Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi")
> moved the sdram include from rk3399-puma-ddrX.dts to new files
> rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.
> 
> Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux")
> replaced the rk3399-puma.dtsi nearly completely, but in the kernel
> it definitly depends on a baseboard dts to actually enable peripherals
> like sd-slot, uarts, etc.
> 
> So to untagle this and bring the whole thing more in line with mainline
> Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate
> DDR-option devicetrees and instead replace them with a puma Kconfig option
> to select and include the needed DDR variant.
> 
> Signed-off-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>

Reviewed-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>




More information about the U-Boot mailing list