Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-27 15:12:21 +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-08-24 11:57:03 -04:00
commit a31a415803
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/mips/include/asm/mipsregs.h
View file

@ -594,7 +594,7 @@ do { \
*/
#define __read_32bit_c0_register(source, sel) \
({ int __res; \
({ unsigned int __res; \
if (sel == 0) \
__asm__ __volatile__( \
"mfc0\t%0, " #source "\n\t" \
@ -676,7 +676,7 @@ do { \
* On RM7000/RM9000 these are uses to access cop0 set 1 registers
*/
#define __read_32bit_c0_ctrl_register(source) \
({ int __res; \
({ unsigned int __res; \
__asm__ __volatile__( \
"cfc0\t%0, " #source "\n\t" \
: "=r" (__res)); \

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

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