Patchwork [U-Boot,v2,14/58] x86: Remove reset_status, relocoff from global_data

login
register
mail settings
Submitter Simon Glass
Date Dec. 14, 2012, 6:48 a.m.
Message ID <1355467767-29575-15-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/206307/
State Accepted, archived
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - Dec. 14, 2012, 6:48 a.m.
These fields are not used on x86, so punt them.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Rebase to master

 arch/x86/include/asm/global_data.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index eded279..06dd84f 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -53,7 +53,6 @@  struct global_data {
 	unsigned long	precon_buf_idx;	/* Pre-Console buffer index */
 #endif
 	unsigned long	reloc_off;	/* Relocation Offset */
-	unsigned long	load_off;	/* Load Offset */
 	unsigned long	env_addr;	/* Address  of Environment struct */
 	unsigned long	env_valid;	/* Checksum of Environment valid? */
 	unsigned long	cpu_clk;	/* CPU clock in Hz!		*/
@@ -61,7 +60,6 @@  struct global_data {
 	unsigned long	relocaddr;	/* Start address of U-Boot in RAM */
 	unsigned long	start_addr_sp;	/* start_addr_stackpointer */
 	phys_size_t	ram_size;	/* RAM size */
-	unsigned long	reset_status;	/* reset status register at boot */
 	const void	*fdt_blob;	/* Our device tree, NULL if none */
 	void		**jt;		/* jump table */
 	char		env_buf[32];	/* buffer for getenv() before reloc. */