diff mbox

[U-Boot,RESEND,v2,4/6] boston: Setup memory ranges in FDT provided to Linux

Message ID 20170430192244.9623-5-daniel.schwierzeck@gmail.com
State Accepted
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Daniel Schwierzeck April 30, 2017, 7:22 p.m. UTC
From: Paul Burton <paul.burton@imgtec.com>

The boston memory map isn't suited to the simple "all memory starting
from 0" approach that the MIPS arch_fixup_fdt() implementation takes.
Instead we need to indicate the first 256MiB of DDR from 0 and the rest
from 0x90000000. Implement ft_board_setup to do that.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---

Changes in v2: None

 arch/mips/Kconfig            |  1 +
 board/imgtec/boston/Makefile |  1 +
 board/imgtec/boston/dt.c     | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 board/imgtec/boston/dt.c

Comments

Simon Glass May 4, 2017, 4:50 p.m. UTC | #1
On 30 April 2017 at 13:22, Daniel Schwierzeck
<daniel.schwierzeck@gmail.com> wrote:
> From: Paul Burton <paul.burton@imgtec.com>
>
> The boston memory map isn't suited to the simple "all memory starting
> from 0" approach that the MIPS arch_fixup_fdt() implementation takes.
> Instead we need to indicate the first 256MiB of DDR from 0 and the rest
> from 0x90000000. Implement ft_board_setup to do that.
>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
>
> Changes in v2: None
>
>  arch/mips/Kconfig            |  1 +
>  board/imgtec/boston/Makefile |  1 +
>  board/imgtec/boston/dt.c     | 27 +++++++++++++++++++++++++++
>  3 files changed, 29 insertions(+)
>  create mode 100644 board/imgtec/boston/dt.c

Reviewed-by: Simon Glass <sjg@chromium.org>
Daniel Schwierzeck May 12, 2017, 9:05 p.m. UTC | #2
Am 30.04.2017 um 21:22 schrieb Daniel Schwierzeck:
> From: Paul Burton <paul.burton@imgtec.com>
> 
> The boston memory map isn't suited to the simple "all memory starting
> from 0" approach that the MIPS arch_fixup_fdt() implementation takes.
> Instead we need to indicate the first 256MiB of DDR from 0 and the rest
> from 0x90000000. Implement ft_board_setup to do that.
> 
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
> 
> Changes in v2: None
> 
>  arch/mips/Kconfig            |  1 +
>  board/imgtec/boston/Makefile |  1 +
>  board/imgtec/boston/dt.c     | 27 +++++++++++++++++++++++++++
>  3 files changed, 29 insertions(+)
>  create mode 100644 board/imgtec/boston/dt.c
> 

applied to u-boot-mips/master, thanks.
diff mbox

Patch

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 07488fe651..d07b92d1b4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -97,6 +97,7 @@  config TARGET_BOSTON
 	select MIPS_CM
 	select MIPS_L1_CACHE_SHIFT_6
 	select MIPS_L2_CACHE
+	select OF_BOARD_SETUP
 	select SUPPORTS_BIG_ENDIAN
 	select SUPPORTS_LITTLE_ENDIAN
 	select SUPPORTS_CPU_MIPS32_R1
diff --git a/board/imgtec/boston/Makefile b/board/imgtec/boston/Makefile
index deda457f3c..d3fd49d285 100644
--- a/board/imgtec/boston/Makefile
+++ b/board/imgtec/boston/Makefile
@@ -6,4 +6,5 @@ 
 
 obj-y += checkboard.o
 obj-y += ddr.o
+obj-y += dt.o
 obj-y += lowlevel_init.o
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
new file mode 100644
index 0000000000..b34f9bc205
--- /dev/null
+++ b/board/imgtec/boston/dt.c
@@ -0,0 +1,27 @@ 
+/*
+ * Copyright (C) 2016 Imagination Technologies
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#include <common.h>
+#include <fdt_support.h>
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+	DECLARE_GLOBAL_DATA_PTR;
+	u64 mem_start[2], mem_size[2];
+	int mem_regions;
+
+	mem_start[0] = 0;
+	mem_size[0] = min_t(u64, 256llu << 20, gd->ram_size);
+	mem_regions = 1;
+
+	if (gd->ram_size > mem_size[0]) {
+		mem_start[1] = 0x80000000 + mem_size[0];
+		mem_size[1] = gd->ram_size - mem_size[0];
+		mem_regions++;
+	}
+
+	return fdt_fixup_memory_banks(blob, mem_start, mem_size, mem_regions);
+}