projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpc83xx: Add support for MergerBox board
[oweals/u-boot.git]
/
board
/
nx823
/
flash.c
diff --git
a/board/nx823/flash.c
b/board/nx823/flash.c
index 194d841e4ea85fa819468e7db65707b1009e7278..336e70412be0219acbef3ba5f694188efb5f6029 100644
(file)
--- a/
board/nx823/flash.c
+++ b/
board/nx823/flash.c
@@
-27,8
+27,9
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
+DECLARE_GLOBAL_DATA_PTR;
+
flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
-extern u_long *my_sernum; /* from nx823.c */
/*-----------------------------------------------------------------------
* Protection Flags:
/*-----------------------------------------------------------------------
* Protection Flags:
@@
-346,7
+347,7
@@
int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
if (addr >= CONFIG_SYS_FLASH_SN_SECTOR && addr < CONFIG_SYS_FLASH_SN_BASE)
{
u_long dest = CONFIG_SYS_FLASH_SN_BASE;
if (addr >= CONFIG_SYS_FLASH_SN_SECTOR && addr < CONFIG_SYS_FLASH_SN_BASE)
{
u_long dest = CONFIG_SYS_FLASH_SN_BASE;
- u_short *sn = (u_short *)
my
_sernum;
+ u_short *sn = (u_short *)
gd->bd->bi
_sernum;
printf("(saving sernum)");
for (i=0; i<4; i++)
printf("(saving sernum)");
for (i=0; i<4; i++)