On 20.11.18 13:04, Marek Behún wrote:
Depending on the data in the OTP memory, differentiate between the 512 MiB and 1 GiB versions of Turris Mox and report these RAM sizes in dram_init and dram_init_banksize.
Signed-off-by: Marek Behún marek.behun@nic.cz
arch/arm/mach-mvebu/arm64-common.c | 7 ++++++- board/CZ.NIC/turris_mox/turris_mox.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index f47273fde9..5e6ac9fc4a 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -43,8 +43,12 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void) return NULL; }
-/* DRAM init code ... */ +/*
- DRAM init code ...
- Turris Mox defines this itself, depending on data in burned eFuses
- */
+#ifndef CONFIG_TARGET_TURRIS_MOX int dram_init_banksize(void) { fdtdec_setup_memory_banksize(); @@ -59,6 +63,7 @@ int dram_init(void)
return 0; } +#endif /* !CONFIG_TARGET_TURRIS_MOX */
2 Problems with this:
a) This does not apply any more with the latest changes in mainline.
b) I really don't like #ifdef's here in this common code. Can you not get rid of this somehow? Isn't the turris_mox also using ATF and will read the RAM size from there?
U-Boot still has the good old get_ram_size() function, which can easily auto-detect 512MiB vs 1GiB when run with 1GiB as parameter.
Thanks, Stefan
int arch_cpu_init(void) { diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 89b3cd2ce0..9aa2fc004d 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -14,6 +14,7 @@ #include <linux/string.h> #include <linux/libfdt.h> #include <fdt_support.h> +#include <environment.h>
#ifdef CONFIG_WDT_ARMADA_37XX #include <wdt.h> @@ -40,6 +41,32 @@
DECLARE_GLOBAL_DATA_PTR;
+int dram_init(void) +{
- int ret, ram_size;
- gd->ram_base = 0;
- gd->ram_size = (phys_size_t)0x20000000;
- ret = mbox_sp_get_board_info(NULL, NULL, NULL, NULL, &ram_size);
- if (ret < 0) {
puts("Cannot read RAM size from OTP, defaulting to 512 MiB");- } else {
if (ram_size == 1024)gd->ram_size = (phys_size_t)0x40000000;- }
- return 0;
+}
+int dram_init_banksize(void) +{
- gd->bd->bi_dram[0].start = (phys_addr_t)0;
- gd->bd->bi_dram[0].size = gd->ram_size;
- return 0;
+}
- #if defined(CONFIG_OF_BOARD_FIXUP) int board_fix_fdt(void *blob) {
Viele Grüße, Stefan