mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-17 10:24:49 +00:00

In commit100f489f58
("rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC"), the spi1 bootph properties were mistakenly removed meaning, so re-add them back to fix SPI-NOR flash not being found in U-Boot pre-reloc as required for RK3399 Puma. Fixes:100f489f58
("rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC") Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Reviewed-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
193 lines
2.5 KiB
Text
193 lines
2.5 KiB
Text
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
|
|
*/
|
|
#include "rockchip-u-boot.dtsi"
|
|
|
|
/ {
|
|
aliases {
|
|
mmc0 = &sdhci;
|
|
mmc1 = &sdmmc;
|
|
pci0 = &pcie0;
|
|
spi1 = &spi1;
|
|
};
|
|
|
|
chosen {
|
|
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
|
};
|
|
|
|
pmusgrf: syscon@ff330000 {
|
|
compatible = "rockchip,rk3399-pmusgrf", "syscon";
|
|
reg = <0x0 0xff330000 0x0 0xe3d4>;
|
|
bootph-all;
|
|
};
|
|
|
|
cic: syscon@ff620000 {
|
|
compatible = "rockchip,rk3399-cic", "syscon";
|
|
reg = <0x0 0xff620000 0x0 0x100>;
|
|
bootph-all;
|
|
};
|
|
};
|
|
|
|
#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
|
|
&binman {
|
|
multiple-images;
|
|
rom {
|
|
filename = "u-boot.rom";
|
|
size = <0x400000>;
|
|
pad-byte = <0xff>;
|
|
|
|
mkimage {
|
|
args = "-n rk3399 -T rkspi";
|
|
u-boot-spl {
|
|
};
|
|
};
|
|
u-boot-img {
|
|
offset = <0x40000>;
|
|
};
|
|
u-boot {
|
|
offset = <0x300000>;
|
|
};
|
|
fdtmap {
|
|
};
|
|
};
|
|
};
|
|
#endif /* CONFIG_ROCKCHIP_SPI_IMAGE && CONFIG_HAS_ROM */
|
|
|
|
&cru {
|
|
bootph-all;
|
|
};
|
|
|
|
&dfi {
|
|
bootph-all;
|
|
};
|
|
|
|
&dmc {
|
|
reg = <0x0 0xffa80000 0x0 0x0800
|
|
0x0 0xffa80800 0x0 0x1800
|
|
0x0 0xffa82000 0x0 0x2000
|
|
0x0 0xffa84000 0x0 0x1000
|
|
0x0 0xffa88000 0x0 0x0800
|
|
0x0 0xffa88800 0x0 0x1800
|
|
0x0 0xffa8a000 0x0 0x2000
|
|
0x0 0xffa8c000 0x0 0x1000>;
|
|
bootph-all;
|
|
status = "okay";
|
|
};
|
|
|
|
&emmc_phy {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&grf {
|
|
bootph-all;
|
|
};
|
|
|
|
&pcfg_pull_none {
|
|
bootph-all;
|
|
};
|
|
|
|
&pcfg_pull_up {
|
|
bootph-all;
|
|
};
|
|
|
|
&pinctrl {
|
|
bootph-all;
|
|
};
|
|
|
|
&pmu {
|
|
bootph-all;
|
|
};
|
|
|
|
&pmucru {
|
|
bootph-all;
|
|
};
|
|
|
|
&pmugrf {
|
|
bootph-all;
|
|
};
|
|
|
|
&sdhci {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
max-frequency = <200000000>;
|
|
|
|
/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
|
|
u-boot,spl-fifo-mode;
|
|
};
|
|
|
|
&sdmmc {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
|
|
/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
|
|
u-boot,spl-fifo-mode;
|
|
};
|
|
|
|
&sdmmc_bus4 {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&sdmmc_cd {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&sdmmc_clk {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&sdmmc_cmd {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&spi1 {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&spi1_clk {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&spi1_cs0 {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&spi1_rx {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&spi1_tx {
|
|
bootph-pre-ram;
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&uart2 {
|
|
bootph-all;
|
|
clock-frequency = <24000000>;
|
|
};
|
|
|
|
&uart2c_xfer {
|
|
bootph-pre-sram;
|
|
bootph-pre-ram;
|
|
};
|
|
|
|
&vopb {
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&vopl {
|
|
bootph-some-ram;
|
|
};
|
|
|
|
&xin24m {
|
|
bootph-all;
|
|
};
|