| Message ID | 20220520123026.19818-1-g-vlaev@ti.com |
|---|---|
| State | Accepted |
| Commit | e7356f08e91566293415915b08229938c062a279 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm: dts: k3-am642-*: Mark the memory node with u-boot, dm-spl | expand |
On Fri, May 20, 2022 at 03:30:26PM +0300, Georgi Vlaev wrote: > Since commit dffdb1f8eb ("board: ti: am64x: Use fdt functions > for ram and bank init") ddr_init() and dram_bank_init() have > switched to fdtdec for getting the memory configuration from > the am64xx dts files instead of using hardcoded values. This > requires an accessible memory node in SPL as we already have > in k3-am642-r5-evm.dts. > > Make the memory node accessible in A53 SPL for both am642-sk > and am642-evm and in am642-sk R5 SPL. > > Signed-off-by: Georgi Vlaev <g-vlaev@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, May 20, 2022 at 03:30:26PM +0300, Georgi Vlaev wrote: > Since commit dffdb1f8eb ("board: ti: am64x: Use fdt functions > for ram and bank init") ddr_init() and dram_bank_init() have > switched to fdtdec for getting the memory configuration from > the am64xx dts files instead of using hardcoded values. This > requires an accessible memory node in SPL as we already have > in k3-am642-r5-evm.dts. > > Make the memory node accessible in A53 SPL for both am642-sk > and am642-evm and in am642-sk R5 SPL. > > Signed-off-by: Georgi Vlaev <g-vlaev@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 0c2d97340913..055215cff8dc 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -8,6 +8,10 @@ stdout-path = "serial2:115200n8"; tick-timer = &timer1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{ diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts index 1f96e3fcacf2..cf3ba0e209cb 100644 --- a/arch/arm/dts/k3-am642-r5-sk.dts +++ b/arch/arm/dts/k3-am642-r5-sk.dts @@ -27,7 +27,7 @@ device_type = "memory"; /* 2G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>; - + u-boot,dm-spl; }; a53_0: a53@0 { diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 650422813639..dda2c5d18a71 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -12,6 +12,10 @@ aliases { mmc1 = &sdhci1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{
Since commit dffdb1f8eb ("board: ti: am64x: Use fdt functions for ram and bank init") ddr_init() and dram_bank_init() have switched to fdtdec for getting the memory configuration from the am64xx dts files instead of using hardcoded values. This requires an accessible memory node in SPL as we already have in k3-am642-r5-evm.dts. Make the memory node accessible in A53 SPL for both am642-sk and am642-evm and in am642-sk R5 SPL. Signed-off-by: Georgi Vlaev <g-vlaev@ti.com> --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-am642-r5-sk.dts | 2 +- arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) base-commit: f83bd23e2a0e9861969c9d43395299a14f25ddda