powerpc: Drop CONFIG_SYS_ALLOC_DPRAM

[u-boot] / arch / powerpc / cpu / mpc8xx / scc.c

diff --git a/arch/powerpc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c
index 66e4014f7586d4bb7731b9978d54f24f6f62b6c1..17bcc2fe0a14ef0cadbe660dcf04e0285c9bc615 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/scc.c
+++ b/arch/powerpc/cpu/mpc8xx/scc.c
@@ -77,7 +77,7 @@ int scc_initialize(bd_t *bis)
        dev = (struct eth_device*) malloc(sizeof *dev);
        memset(dev, 0, sizeof *dev);
 
-       sprintf(dev->name, "SCC");
+       strcpy(dev->name, "SCC");
        dev->iobase = 0;
        dev->priv   = 0;
        dev->init   = scc_init;
@@ -159,7 +159,8 @@ static int scc_recv (struct eth_device *dev)
 #endif
                } else {
                        /* Pass the packet up to the protocol layers. */
-                       NetReceive (NetRxPackets[rxIdx], length - 4);
+                       net_process_received_packet(net_rx_packets[rxIdx],
+                                                   length - 4);
                }
 
 
@@ -198,14 +199,8 @@ static int scc_init (struct eth_device *dev, bd_t * bis)
        rxIdx = 0;
        txIdx = 0;
 
-       if (!rtx) {
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-               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
-       }
+       if (!rtx)
+               rtx = (RTXBD *)(immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
 
 #if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD))
        /* Configure port A pins for Txd and Rxd.
@@ -280,7 +275,7 @@ static int scc_init (struct eth_device *dev, bd_t * bis)
        for (i = 0; i < PKTBUFSRX; i++) {
                rtx->rxbd[i].cbd_sc = BD_ENET_RX_EMPTY;
                rtx->rxbd[i].cbd_datlen = 0;    /* Reset */
-               rtx->rxbd[i].cbd_bufaddr = (uint) NetRxPackets[i];
+               rtx->rxbd[i].cbd_bufaddr = (uint) net_rx_packets[i];
        }
 
        rtx->rxbd[PKTBUFSRX - 1].cbd_sc |= BD_ENET_RX_WRAP;