diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/lowlevel_init.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index ddd7eeaf052..95b44c8b1e5 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -291,7 +291,7 @@ void spl_soc_init(void) spl_boot_ipu(); } -void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(u32 *); image_entry_noargs_t image_entry = diff --git a/arch/arm/mach-omap2/lowlevel_init.S b/arch/arm/mach-omap2/lowlevel_init.S index 1a55295f9de..e977805bd03 100644 --- a/arch/arm/mach-omap2/lowlevel_init.S +++ b/arch/arm/mach-omap2/lowlevel_init.S @@ -39,7 +39,7 @@ restore_from_hyp: adr r0, save_sp ldr sp, [r0] MRC p15, 4, R0, c1, c0, 0 - ldr r1, =0X1004 @Set cache enable bits for hypervisor mode + ldr r1, =0x1004 @Set cache enable bits for hypervisor mode orr r0, r0, r1 MCR p15, 4, R0, c1, c0, 0 b switch_to_hypervisor_ret |