projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix PCI-Express on PPC440SPe rev. A.
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
serial.c
diff --git
a/cpu/ppc4xx/serial.c
b/cpu/ppc4xx/serial.c
index 273452098726a910f69bff1a223824f07c3cff2f..3749811dca64a09cd203ac5bce245164a0db3b7a 100644
(file)
--- a/
cpu/ppc4xx/serial.c
+++ b/
cpu/ppc4xx/serial.c
@@
-59,6
+59,8
@@
#include <malloc.h>
#endif
#include <malloc.h>
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
/*****************************************************************************/
#ifdef CONFIG_IOP480
/*****************************************************************************/
#ifdef CONFIG_IOP480
@@
-161,8
+163,6
@@
int serial_init (void)
{
int serial_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile char val;
unsigned short br_reg;
volatile char val;
unsigned short br_reg;
@@
-185,8
+185,6
@@
int serial_init (void)
void serial_setbrg (void)
{
void serial_setbrg (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
unsigned short br_reg;
br_reg = ((((CONFIG_CPUCLOCK * 1000000) / 16) / gd->baudrate) - 1);
unsigned short br_reg;
br_reg = ((((CONFIG_CPUCLOCK * 1000000) / 16) / gd->baudrate) - 1);
@@
-435,8
+433,6
@@
int serial_init_dev (unsigned long dev_base)
int serial_init(void)
#endif
{
int serial_init(void)
#endif
{
- DECLARE_GLOBAL_DATA_PTR;
-
unsigned long reg;
unsigned long udiv;
unsigned short bdiv;
unsigned long reg;
unsigned long udiv;
unsigned short bdiv;
@@
-527,8
+523,6
@@
int serial_init_dev (unsigned long dev_base)
int serial_init (void)
#endif
{
int serial_init (void)
#endif
{
- DECLARE_GLOBAL_DATA_PTR;
-
unsigned long reg;
unsigned long tmp;
unsigned long clk;
unsigned long reg;
unsigned long tmp;
unsigned long clk;
@@
-604,8
+598,6
@@
void serial_setbrg_dev (unsigned long dev_base)
void serial_setbrg (void)
#endif
{
void serial_setbrg (void)
#endif
{
- DECLARE_GLOBAL_DATA_PTR;
-
unsigned long tmp;
unsigned long clk;
unsigned long udiv;
unsigned long tmp;
unsigned long clk;
unsigned long udiv;
@@
-907,8
+899,6
@@
int serial_buffered_tstc (void)
#if (CONFIG_KGDB_SER_INDEX & 2)
void kgdb_serial_init (void)
{
#if (CONFIG_KGDB_SER_INDEX & 2)
void kgdb_serial_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile char val;
unsigned short br_reg;
volatile char val;
unsigned short br_reg;