summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-19 08:07:41 -0400
committerTom Rini <trini@konsulko.com>2016-04-19 08:07:41 -0400
commitf8c6390b668e02509296c9c7ce5073255e121456 (patch)
treed376bacd9cb08711cd2eccaecc65b99163aec0b1 /arch
parent59d7c34bfcd919f46d4bec41ecbc054aaea4adf6 (diff)
parentfdff5b0598c73767c2cad097c66a82a705463452 (diff)
downloadu-boot-imx-f8c6390b668e02509296c9c7ce5073255e121456.zip
u-boot-imx-f8c6390b668e02509296c9c7ce5073255e121456.tar.gz
u-boot-imx-f8c6390b668e02509296c9c7ce5073255e121456.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/lib/bootm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index eed159c..aa0475a 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -9,6 +9,7 @@
#include <image.h>
#include <fdt_support.h>
#include <asm/addrspace.h>
+#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -252,10 +253,10 @@ static int boot_reloc_fdt(bootm_headers_t *images)
#endif
}
-int arch_fixup_memory_node(void *blob)
+int arch_fixup_fdt(void *blob)
{
#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
- u64 mem_start = 0;
+ u64 mem_start = virt_to_phys((void *)gd->bd->bi_memstart);
u64 mem_size = gd->ram_size;
return fdt_fixup_memory_banks(blob, &mem_start, &mem_size, 1);