[U-Boot] [PATCH v2 13/19] ARM: dts: rockchip: prefer u-boot, dm-pre-reloc rather than u-boot, dm-spl

[Heiko Stübner]

Hi Pawel,

Am Freitag, 11. August 2017, 22:57:29 CEST schrieb Paweł Jarosz:
> rk3xxx.dtsi is used by rk3188 and rk3066. rk3188 uses alocated data in spl
> but rk3066 needs it in tpl.
> 
> Signed-off-by: Paweł Jarosz <paweljarosz3691 at gmail.com>
> ---
> Changes since v1:
> - none
> 
>  arch/arm/dts/rk3xxx.dtsi | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/dts/rk3xxx.dtsi b/arch/arm/dts/rk3xxx.dtsi
> index 6d9e36d..d1c205b 100644
> --- a/arch/arm/dts/rk3xxx.dtsi
> +++ b/arch/arm/dts/rk3xxx.dtsi
> @@ -135,7 +135,7 @@
>  	};
> 
>  	noc: syscon at 10128000 {
> -		u-boot,dm-spl;
> +		u-boot,dm-pre-reloc;

That probably won't work on rk3188. I haven't looked to closely
on the rk3188 support for a while, but there we used the TPL for
the single jump back to the bootloader after reading the 1KB
of initial code.

So with the code as is, this would make the rk3188 TPL most likely to big.

As both the rk3066 and rk3188 are very similar, I'd guess the best
option would be to just adapt the rk3188 to you newer rk3066
approach, so that they don't diverge to much. Especially as the
rk3188 has the same nand controller and people may want to
boot of on-chip nand on the rk3188 in the future as well.


Heiko

>  		compatible = "rockchip,rk3188-noc", "syscon";
>  		reg = <0x10128000 0x2000>;
>  	};
> @@ -218,13 +218,13 @@
>  	pmu: pmu at 20004000 {
>  		compatible = "rockchip,rk3066-pmu", "syscon";
>  		reg = <0x20004000 0x100>;
> -		u-boot,dm-spl;
> +		u-boot,dm-pre-reloc;
>  	};
> 
>  	grf: grf at 20008000 {
>  		compatible = "syscon";
>  		reg = <0x20008000 0x200>;
> -		u-boot,dm-spl;
> +		u-boot,dm-pre-reloc;
>  	};
> 
>  	dmc: dmc at 20020000 {
> @@ -238,7 +238,7 @@
>  		       0x20040000 0x294>;
>  		clocks = <&cru PCLK_DDRUPCTL>, <&cru PCLK_PUBL>;
>  		clock-names = "pclk_ddrupctl", "pclk_publ";
> -		u-boot,dm-spl;
> +		u-boot,dm-pre-reloc;
>  	};
> 
>  	i2c0: i2c at 2002d000 {