diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-24 11:57:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-24 11:57:03 -0400 |
| commit | a31a415803b8850f52d78395103fca3bdd1d37af (patch) | |
| tree | d969bf0d1c49b145482881bb97809fe3c53017f0 | |
| parent | c851a2458fbc12495f4f786d4eabb612850a5143 (diff) | |
| parent | 4adcb2380c899be91e46be93662084b3e08c5f21 (diff) | |
| download | u-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
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 4 | ||||
| -rw-r--r-- | arch/mips/lib/bootm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 3571e4f..c7a0849 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -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)); \ 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); |