diff options
| author | Stefan Roese <sr@denx.de> | 2008-09-23 10:15:59 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-09-23 10:15:59 +0200 |
| commit | 50a874b3b0272f32e3627732fab90b27fbd35066 (patch) | |
| tree | 0adead0a65471cce00f6475208e513e7a8469eb3 /cpu/mpc8xx | |
| parent | 5289feadb7857e2eaf81848aa632afa4a07bc0cc (diff) | |
| parent | 8fd4166c467a46773f80208bda1ec3b4757747bc (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'cpu/mpc8xx')
| -rw-r--r-- | cpu/mpc8xx/scc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpu/mpc8xx/scc.c b/cpu/mpc8xx/scc.c index 09a3db107b..09a6348fd0 100644 --- a/cpu/mpc8xx/scc.c +++ b/cpu/mpc8xx/scc.c @@ -215,12 +215,14 @@ static int scc_init (struct eth_device *dev, bd_t * bis) rxIdx = 0; txIdx = 0; + if (!rtx) { #ifdef CFG_ALLOC_DPRAM - rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + - dpram_alloc_align (sizeof (RTXBD), 8)); + rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + + dpram_alloc_align (sizeof (RTXBD), 8)); #else - rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE); -#endif /* 0 */ + rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE); +#endif + } #if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD)) /* Configure port A pins for Txd and Rxd. |