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-mpc5xxx
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
commproc.c
diff --git
a/cpu/mpc8260/commproc.c
b/cpu/mpc8260/commproc.c
index ceb9275d264d45cda102c4658a77edebc13933f6..8777e773698c0addaf5681e98f603f22c2e99b13 100644
(file)
--- a/
cpu/mpc8260/commproc.c
+++ b/
cpu/mpc8260/commproc.c
@@
-20,18
+20,11
@@
#include <common.h>
#include <asm/cpm_8260.h>
#include <common.h>
#include <asm/cpm_8260.h>
-/*
- * because we have stack and init data in dual port ram
- * we must reduce the size
- */
-#undef CPM_DATAONLY_SIZE
-#define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
+DECLARE_GLOBAL_DATA_PTR;
void
m8260_cpm_reset(void)
{
void
m8260_cpm_reset(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile ulong count;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile ulong count;
@@
-61,8
+54,6
@@
m8260_cpm_reset(void)
uint
m8260_cpm_dpalloc(uint size, uint align)
{
uint
m8260_cpm_dpalloc(uint size, uint align)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immr = (immap_t *)CFG_IMMR;
uint retloc;
uint align_mask, off;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
uint retloc;
uint align_mask, off;
@@
-119,8
+110,6
@@
m8260_cpm_hostalloc(uint size, uint align)
void
m8260_cpm_setbrg(uint brg, uint rate)
{
void
m8260_cpm_setbrg(uint brg, uint rate)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile uint *bp;
uint cd = BRG_UART_CLK / rate;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile uint *bp;
uint cd = BRG_UART_CLK / rate;
@@
-144,8
+133,6
@@
m8260_cpm_setbrg(uint brg, uint rate)
void
m8260_cpm_fastbrg(uint brg, uint rate, int div16)
{
void
m8260_cpm_fastbrg(uint brg, uint rate, int div16)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile uint *bp;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile uint *bp;