projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
[oweals/u-boot.git]
/
board
/
sx1
/
sx1.c
diff --git
a/board/sx1/sx1.c
b/board/sx1/sx1.c
index e45f6ae4f3466eb7e273fa65b83efa8c0dc04874..aaef76e713decc903155aa4c558f256fe111b9a1 100644
(file)
--- a/
board/sx1/sx1.c
+++ b/
board/sx1/sx1.c
@@
-27,6
+27,8
@@
#include <common.h>
#include <common.h>
+DECLARE_GLOBAL_DATA_PTR;
+
static void flash__init (void);
static void ether__init (void);
static void flash__init (void);
static void ether__init (void);
@@
-43,8
+45,6
@@
static inline void delay (unsigned long loops)
int board_init (void)
{
int board_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* arch number of SX1 Board */
gd->bd->bi_arch_number = MACH_TYPE_SX1;
/* arch number of SX1 Board */
gd->bd->bi_arch_number = MACH_TYPE_SX1;
@@
-116,8
+116,6
@@
static void ether__init (void)
int dram_init (void)
{
int dram_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;