| Message ID | 1320755603-8695-13-git-send-email-graeme.russ@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Graeme Russ |
| Headers | show |
On 08/11/11 23:33, Graeme Russ wrote: > Signed-off-by: Graeme Russ <graeme.russ@gmail.com> > --- > Changes for v1: > - None (skipped to set single version for consolidated series) > Changes for v2: > - Consolidated patch series > > arch/x86/cpu/start.S | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) Applied to u-boot-x86 Thanks, Graeme
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index d099fc9..f87633b 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -48,7 +48,7 @@ _x86boot_start: cli cld - /* Turn of cache (this might require a 486-class CPU) */ + /* Turn off cache (this might require a 486-class CPU) */ movl %cr0, %eax orl $(X86_CR0_NW | X86_CR0_CD), %eax movl %eax, %cr0 @@ -122,7 +122,8 @@ relocate_code: /* Jump to in-RAM copy of board_init_r() */ call *%ebp -die: hlt +die: + hlt jmp die hlt
Signed-off-by: Graeme Russ <graeme.russ@gmail.com> --- Changes for v1: - None (skipped to set single version for consolidated series) Changes for v2: - Consolidated patch series arch/x86/cpu/start.S | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -- 1.7.5.2.317.g391b14