Patchwork [U-Boot,v2,49/58] microblaze: Use generic global_data

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

Comments

Simon Glass - Dec. 14, 2012, 6:49 a.m.
Move microblaze over to use generic global_data.

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

 arch/microblaze/include/asm/global_data.h |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)
Michal Simek - Dec. 14, 2012, 10:45 a.m.
Hi Simon,

2012/12/14 Simon Glass <sjg@chromium.org>:
> Move microblaze over to use generic global_data.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> Changes in v2: None
>
>  arch/microblaze/include/asm/global_data.h |   27 +--------------------------
>  1 files changed, 1 insertions(+), 26 deletions(-)
>

will be better to provide link to any git repo/branch which I can just
download and test.
Anyway I have tested it on real hw without any issue.

Tested-by: Michal Simek <monstr@monstr.eu>

Thanks,
Michal
Simon Glass - Dec. 14, 2012, 4:41 p.m.
Hi Michal,

On Fri, Dec 14, 2012 at 2:45 AM, Michal Simek <monstr@monstr.eu> wrote:
> Hi Simon,
>
> 2012/12/14 Simon Glass <sjg@chromium.org>:
>> Move microblaze over to use generic global_data.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>> Changes in v2: None
>>
>>  arch/microblaze/include/asm/global_data.h |   27 +--------------------------
>>  1 files changed, 1 insertions(+), 26 deletions(-)
>>
>
> will be better to provide link to any git repo/branch which I can just
> download and test.
> Anyway I have tested it on real hw without any issue.
>
> Tested-by: Michal Simek <monstr@monstr.eu>

Thanks. I have pushed the source tree here for now:

http://git.denx.de/u-boot-x86.git    (branch us-board-gc6)

Regards,
Simon

>
> Thanks,
> Michal
>
> --
> Michal Simek, Ing. (M.Eng)
> w: www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
> Microblaze U-BOOT custodian

Patch

diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h
index 025131c..89dcef7 100644
--- a/arch/microblaze/include/asm/global_data.h
+++ b/arch/microblaze/include/asm/global_data.h
@@ -29,32 +29,7 @@ 
 struct arch_global_data {
 };
 
-/*
- * The following data structure is placed in some memory wich is
- * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
- * some locked parts of the data cache) to allow for a minimum set of
- * global variables during system initialization (until we have set
- * up the memory controller so that we can use RAM).
- */
-
-typedef	struct	global_data {
-	bd_t		*bd;
-	unsigned long	flags;
-	unsigned int	baudrate;
-	unsigned long	have_console;	/* serial_init() was called */
-#ifdef CONFIG_PRE_CONSOLE_BUFFER
-	unsigned long	precon_buf_idx;	/* Pre-Console buffer index */
-#endif
-	unsigned long	env_addr;	/* Address  of Environment struct */
-	const void	*fdt_blob;	/* Our device tree, NULL if none */
-	unsigned long	env_valid;	/* Checksum of Environment valid? */
-	unsigned long	fb_base;	/* base address of frame buffer */
-	void		**jt;		/* jump table */
-	char		env_buf[32];	/* buffer for getenv() before reloc. */
-	struct arch_global_data arch;	/* architecture-specific data */
-} gd_t;
-
-#include <asm-generic/global_data_flags.h>
+#include <asm-generic/global_data.h>
 
 #define DECLARE_GLOBAL_DATA_PTR     register volatile gd_t *gd asm ("r31")