x86: Remove x86 specific GD flags as they are not referenced at all

This patch removes the x86 architecture specific GD flags
(GD_FLG_COLD_BOOT & GD_FLG_WARM_BOOT), as they are not used. Only
GD_FLG_COLD_BOOT is referenced in coreboot.c but assigned in start16.S.
But the coreboot target does not use start16.S at all and boots directly
from the 32-bit start code.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 4c6ed0bfb2815140bd91b7f498b7b8d9f944cb13..9686f8ed5b41c2b5f6efabb250cb34688c2b56e6 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -73,9 +73,6 @@ static void board_final_cleanup(void)
 
 int last_stage_init(void)
 {
-       if (gd->flags & GD_FLG_COLD_BOOT)
-               timestamp_add_to_bootstage();
-
        /* start usb so that usb keyboard can be used as input device */
        if (CONFIG_IS_ENABLED(USB_KEYBOARD))
                usb_init();

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index 71cd70f9cde402f5d53479f851088878163f56e9..3c9bdf2a9d6f026356495f2e5ed03626dc48e157 100644 (file)
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -40,9 +40,6 @@ _x86boot_start:
        movl    %eax, %cr0
        wbinvd
 
-       /* Tell 32-bit code it is being entered from an in-RAM copy */
-       movl    $GD_FLG_WARM_BOOT, %ebx
-
        /*
         * Zero the BIST (Built-In Self Test) value since we don't have it.
         * It must be 0 or the previous loader would have reported an error.
@@ -55,11 +52,7 @@ _x86boot_start:
        .align  4
        .long   0x12345678
 _start:
-       /*
-        * This is the 32-bit cold-reset entry point, coming from start16.
-        * Set %ebx to GD_FLG_COLD_BOOT to indicate this.
-        */
-       movl    $GD_FLG_COLD_BOOT, %ebx
+       /* This is the 32-bit cold-reset entry point, coming from start16 */
 
        /* Save BIST */
        movl    %eax, %ebp

diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S
index dd659278ffeec7ade18e64d1018597c6dd3bb931..474efe4df5f426ba799499cc775f87752b6f5c51 100644 (file)
--- a/arch/x86/cpu/start16.S
+++ b/arch/x86/cpu/start16.S
@@ -23,9 +23,6 @@ start16:
        /* Save BIST */
        movl    %eax, %ecx
 
-       /* Set the Cold Boot / Hard Reset flag */
-       movl    $GD_FLG_COLD_BOOT, %ebx
-
        xorl    %eax, %eax
        movl    %eax, %cr3      /* Invalidate TLB */
 

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 797397e6977e6ad1846ccc14b71b459c82fbf10c..17a4d344913ffbb4532ff03c4939368e89baf6c3 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -137,10 +137,4 @@ static inline __attribute__((no_instrument_function)) gd_t *get_fs_gd_ptr(void)
 
 #endif
 
-/*
- * Our private Global Data Flags
- */
-#define GD_FLG_COLD_BOOT       0x10000 /* Cold Boot */
-#define GD_FLG_WARM_BOOT       0x20000 /* Warm Boot */
-
 #endif /* __ASM_GBL_DATA_H */