summaryrefslogtreecommitdiff
path: root/arch/mips/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-24 11:57:03 -0400
committerTom Rini <trini@konsulko.com>2015-08-24 11:57:03 -0400
commita31a415803b8850f52d78395103fca3bdd1d37af (patch)
treed969bf0d1c49b145482881bb97809fe3c53017f0 /arch/mips/lib
parentc851a2458fbc12495f4f786d4eabb612850a5143 (diff)
parent4adcb2380c899be91e46be93662084b3e08c5f21 (diff)
downloadu-boot-imx-a31a415803b8850f52d78395103fca3bdd1d37af.zip
u-boot-imx-a31a415803b8850f52d78395103fca3bdd1d37af.tar.gz
u-boot-imx-a31a415803b8850f52d78395103fca3bdd1d37af.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/lib')
-rw-r--r--arch/mips/lib/bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index e289799..9c647aa 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -95,10 +95,10 @@ static void boot_setup_fdt(bootm_headers_t *images)
debug("## setup FDT\n");
- fdt_chosen(images->ft_addr, 1);
+ fdt_chosen(images->ft_addr);
fdt_fixup_memory_banks(images->ft_addr, &mem_start, &mem_size, 1);
fdt_fixup_ethernet(images->ft_addr);
- fdt_initrd(images->ft_addr, images->initrd_start, images->initrd_end, 1);
+ fdt_initrd(images->ft_addr, images->initrd_start, images->initrd_end);
#if defined(CONFIG_OF_BOARD_SETUP)
ft_board_setup(images->ft_addr, gd->bd);