diff options
author | Marek BehĂșn <marek.behun@nic.cz> | 2018-12-17 18:10:09 +0300 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2019-01-21 13:39:50 +0300 |
commit | 3b281aca41dbad65fc0ccc2bed5c2caf684210fc (patch) | |
tree | 3f574236ffc66e4078e0203d687e03b113588c33 | |
parent | c87b87006b0d1f42dd0b2f3a2c0a3048959489cf (diff) | |
download | u-boot-3b281aca41dbad65fc0ccc2bed5c2caf684210fc.tar.xz |
arm: mvebu: turris_mox: Support 1 GB version of Turris Mox
Use get_ram_size to determine if the RAM size on Turris Mox is 512 MiB
or 1 GiB.
Signed-off-by: Marek BehĂșn <marek.behun@nic.cz>
Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r-- | arch/arm/mach-mvebu/arm64-common.c | 4 | ||||
-rw-r--r-- | board/CZ.NIC/turris_mox/turris_mox.c | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 47bbf69944..aaf7b7c447 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -84,7 +84,7 @@ static void a8k_dram_init_banksize(void) } } -int dram_init_banksize(void) +__weak int dram_init_banksize(void) { if (CONFIG_IS_ENABLED(ARMADA_8K)) a8k_dram_init_banksize(); @@ -94,7 +94,7 @@ int dram_init_banksize(void) return 0; } -int dram_init(void) +__weak int dram_init(void) { if (CONFIG_IS_ENABLED(ARMADA_8K)) { gd->ram_size = a8k_dram_scan_ap_sz(); diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index d16d6fd124..65d50a92dd 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -41,6 +41,22 @@ DECLARE_GLOBAL_DATA_PTR; +int dram_init(void) +{ + gd->ram_base = 0; + gd->ram_size = (phys_size_t)get_ram_size(0, 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) { |