mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-11 21:56:21 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-mips
This commit is contained in:
commit
a31a415803
|
@ -594,7 +594,7 @@ do { \
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define __read_32bit_c0_register(source, sel) \
|
#define __read_32bit_c0_register(source, sel) \
|
||||||
({ int __res; \
|
({ unsigned int __res; \
|
||||||
if (sel == 0) \
|
if (sel == 0) \
|
||||||
__asm__ __volatile__( \
|
__asm__ __volatile__( \
|
||||||
"mfc0\t%0, " #source "\n\t" \
|
"mfc0\t%0, " #source "\n\t" \
|
||||||
|
@ -676,7 +676,7 @@ do { \
|
||||||
* On RM7000/RM9000 these are uses to access cop0 set 1 registers
|
* On RM7000/RM9000 these are uses to access cop0 set 1 registers
|
||||||
*/
|
*/
|
||||||
#define __read_32bit_c0_ctrl_register(source) \
|
#define __read_32bit_c0_ctrl_register(source) \
|
||||||
({ int __res; \
|
({ unsigned int __res; \
|
||||||
__asm__ __volatile__( \
|
__asm__ __volatile__( \
|
||||||
"cfc0\t%0, " #source "\n\t" \
|
"cfc0\t%0, " #source "\n\t" \
|
||||||
: "=r" (__res)); \
|
: "=r" (__res)); \
|
||||||
|
|
|
@ -95,10 +95,10 @@ static void boot_setup_fdt(bootm_headers_t *images)
|
||||||
|
|
||||||
debug("## setup FDT\n");
|
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_memory_banks(images->ft_addr, &mem_start, &mem_size, 1);
|
||||||
fdt_fixup_ethernet(images->ft_addr);
|
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)
|
#if defined(CONFIG_OF_BOARD_SETUP)
|
||||||
ft_board_setup(images->ft_addr, gd->bd);
|
ft_board_setup(images->ft_addr, gd->bd);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user