Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tom Rini 2015-04-24 13:44:28 -04:00
commit 08442ec763
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/mips/Kconfig
View file

@ -141,15 +141,12 @@ config MIPS_BOOT_ENV_LEGACY
The address of the enviroment is stored in register $a2. The address of the enviroment is stored in register $a2.
config MIPS_BOOT_FDT config MIPS_BOOT_FDT
bool "Hand over a flattened device tree to Linux kernel (INCOMPLETE)" bool "Hand over a flattened device tree to Linux kernel"
default n default n
help help
Enable this option if you want U-Boot to hand over a flattened Enable this option if you want U-Boot to hand over a flattened
device tree to the kernel. device tree to the kernel. According to UHI register $a0 will be set
to -2 and the FDT address is stored in $a1.
Note: the final hand over to the kernel is not yet implemented. After
the community agreed on the MIPS boot interface for device trees,
the corresponding code will be added.
endmenu endmenu

6
arch/mips/lib/bootm.c
View file

@ -317,7 +317,11 @@ static void boot_jump_linux(bootm_headers_t *images)
bootstage_report(); bootstage_report();
#endif #endif
kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env, linux_extra); if (images->ft_len)
kernel(-2, (ulong)images->ft_addr, 0, 0);
else
kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env,
linux_extra);
} }
int do_bootm_linux(int flag, int argc, char * const argv[], int do_bootm_linux(int flag, int argc, char * const argv[],