From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] x86: Remove x86 specific GD flags as they are not referenced at all
Date: Fri, 16 Aug 2019 14:45:28 +0200 [thread overview]
Message-ID: <20190816124529.1178-1-sr@denx.de> (raw)
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>
---
arch/x86/cpu/coreboot/coreboot.c | 3 ---
arch/x86/cpu/start.S | 9 +--------
arch/x86/cpu/start16.S | 3 ---
arch/x86/include/asm/global_data.h | 6 ------
4 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 4c6ed0bfb2..9686f8ed5b 100644
--- 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 71cd70f9cd..3c9bdf2a9d 100644
--- 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 dd659278ff..474efe4df5 100644
--- 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 797397e697..17a4d34491 100644
--- 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 */
--
2.22.1
next reply other threads:[~2019-08-16 12:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 12:45 Stefan Roese [this message]
2019-08-16 12:45 ` [U-Boot] [PATCH 2/2] global_data: Remove comment of reserved arch-specific GD flags Stefan Roese
2019-08-16 14:51 ` Bin Meng
2019-08-16 15:05 ` Simon Goldschmidt
2019-08-16 15:59 ` Simon Glass
2019-08-18 13:59 ` Bin Meng
2019-08-16 14:50 ` [U-Boot] [PATCH 1/2] x86: Remove x86 specific GD flags as they are not referenced at all Bin Meng
2019-08-16 15:03 ` Simon Goldschmidt
2019-08-18 13:59 ` Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190816124529.1178-1-sr@denx.de \
--to=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox