Merge branch 'master' of git://git.denx.de/u-boot-mips

This commit is contained in:
Tom Rini 2016-04-19 08:07:41 -04:00
commit f8c6390b66

View File

@ -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);