mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-18 18:59:44 +00:00
97fa784725
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. Commitab800e5a6f("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. Commit167efc2c7a("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@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
36 lines
605 B
Text
36 lines
605 B
Text
if TARGET_PUMA_RK3399
|
|
|
|
config SYS_BOARD
|
|
default "puma_rk3399"
|
|
|
|
config SYS_VENDOR
|
|
default "theobroma-systems"
|
|
|
|
config SYS_CONFIG_NAME
|
|
default "puma_rk3399"
|
|
|
|
config BOARD_SPECIFIC_OPTIONS # dummy
|
|
def_bool y
|
|
|
|
config ENV_SIZE
|
|
default 0x2000
|
|
|
|
config ENV_OFFSET
|
|
default 0x3fc000 if ENV_IS_IN_SPI_FLASH
|
|
|
|
choice
|
|
prompt "Theobroma Systems RK3399-Q7 DDR Option"
|
|
default TARGET_PUMA_RK3399_RAM_DDR3_1333
|
|
|
|
config TARGET_PUMA_RK3399_RAM_DDR3_1333
|
|
bool "DDR3-1333MHz"
|
|
|
|
config TARGET_PUMA_RK3399_RAM_DDR3_1600
|
|
bool "DDR3-1600MHz"
|
|
|
|
config TARGET_PUMA_RK3399_RAM_DDR3_1866
|
|
bool "DDR3-1866MHz"
|
|
|
|
endchoice
|
|
|
|
endif
|