| Message ID | 1320755603-8695-7-git-send-email-graeme.russ@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Graeme Russ |
| Headers | show |
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
On 08/11/11 23:33, Graeme Russ wrote: > Nobody uses them anyway > > 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 | 2 -- > arch/x86/cpu/start16.S | 3 --- > arch/x86/include/asm/global_data.h | 2 -- > 3 files changed, 0 insertions(+), 7 deletions(-) Applied to u-boot-x86 Thanks, Graeme
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 306fb49..1634eb1 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -53,8 +53,6 @@ _x86boot_start: movl %eax, %cr0 wbinvd - /* Tell 32-bit code it is being entered from an in-RAM copy */ - movw $GD_FLG_WARM_BOOT, %bx _start: /* This is the 32-bit cold-reset entry point */ diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 9dabff2..33e53cd 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -37,9 +37,6 @@ .code16 .globl start16 start16: - /* Set the Cold Boot / Hard Reset flag */ - movl $GD_FLG_COLD_BOOT, %ebx - /* * First we let the BSP do some early initialization * this code have to map the flash to its final position diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index f177a4f..c736549 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -91,8 +91,6 @@ extern gd_t *gd; #define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ #define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ #define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ -#define GD_FLG_COLD_BOOT 0x00100 /* Cold Boot */ -#define GD_FLG_WARM_BOOT 0x00200 /* Warm Boot */ #if 0 #define DECLARE_GLOBAL_DATA_PTR
Nobody uses them anyway 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 | 2 -- arch/x86/cpu/start16.S | 3 --- arch/x86/include/asm/global_data.h | 2 -- 3 files changed, 0 insertions(+), 7 deletions(-) -- 1.7.5.2.317.g391b14