mpc83xx: U-Boot support for Wind River SBC8349

[u-boot] / cpu / mpc83xx / cpu.c

diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 1de337b33c66a9bd22a018388819ab8193b5379a..bc61219337e467c05234c6ca3199277db957cefd 100644 (file)
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -18,11 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
- *
- * Change log:
- *
- * 20050101: Eran Liberty (liberty@freescale.com)
- *          Initial file creating (porting from 85XX & 8260)
  */
 
 /*
@@ -49,7 +44,7 @@ int checkcpu(void)
        u32 spridr;
        char buf[32];
 
-       immr = (immap_t *)CFG_IMMRBAR;
+       immr = (immap_t *)CFG_IMMR;
 
        if ((pvr & 0xFFFF0000) != PVR_83xx) {
                puts("Not MPC83xx Family!!!\n");
@@ -97,6 +92,22 @@ int checkcpu(void)
        case SPR_8360_REV12:
                puts("MPC8360, ");
                break;
+       case SPR_8323E_REV10:
+       case SPR_8323E_REV11:
+               puts("MPC8323E, ");
+               break;
+       case SPR_8323_REV10:
+       case SPR_8323_REV11:
+               puts("MPC8323, ");
+               break;
+       case SPR_8321E_REV10:
+       case SPR_8321E_REV11:
+               puts("MPC8321E, ");
+               break;
+       case SPR_8321_REV10:
+       case SPR_8321_REV11:
+               puts("MPC8321, ");
+               break;
        default:
                puts("Rev: Unknown\n");
                return -1;      /* Not sure what this is */
@@ -111,7 +122,7 @@ int checkcpu(void)
 }
 
 
-/**
+/*
  * Program a UPM with the code supplied in the table.
  *
  * The 'dummy' variable is used to increment the MAD. 'dummy' is
@@ -137,11 +148,11 @@ int checkcpu(void)
  * upm: 0=UPMA, 1=UPMB, 2=UPMC
  * table: Pointer to an array of values to program
  * size: Number of elements in the array.  Must be 64 or less.
-*/
+ */
 void upmconfig (uint upm, uint *table, uint size)
 {
 #if defined(CONFIG_MPC834X)
-       volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
+       volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile lbus83xx_t *lbus = &immap->lbus;
        volatile uchar *dummy = NULL;
        const u32 msel = (upm + 4) << BR_MSEL_SHIFT;    /* What the MSEL field in BRn should be */
@@ -188,7 +199,7 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        ulong addr;
 #endif
 
-       volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
+       volatile immap_t *immap = (immap_t *) CFG_IMMR;
 
 #ifdef MPC83xx_RESET
        /* Interrupts and MMU off */
@@ -259,7 +270,7 @@ void watchdog_reset (void)
        int re_enable = disable_interrupts();
 
        /* Reset the 83xx watchdog */
-       volatile immap_t *immr = (immap_t *) CFG_IMMRBAR;
+       volatile immap_t *immr = (immap_t *) CFG_IMMR;
        immr->wdt.swsrr = 0x556c;
        immr->wdt.swsrr = 0xaa39;
 
@@ -297,12 +308,12 @@ ft_cpu_setup(void *blob, bd_t *bd)
                *p = cpu_to_be32(clock);
 
 #ifdef CONFIG_MPC83XX_TSEC1
-       p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/address", &len);
+       p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/local-mac-address", &len);
                memcpy(p, bd->bi_enetaddr, 6);
 #endif
 
 #ifdef CONFIG_MPC83XX_TSEC2
-       p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/address", &len);
+       p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/local-mac-address", &len);
                memcpy(p, bd->bi_enet1addr, 6);
 #endif
 }
@@ -311,7 +322,7 @@ ft_cpu_setup(void *blob, bd_t *bd)
 #if defined(CONFIG_DDR_ECC)
 void dma_init(void)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMRBAR;
+       volatile immap_t *immap = (immap_t *)CFG_IMMR;
        volatile dma83xx_t *dma = &immap->dma;
        volatile u32 status = swab32(dma->dmasr0);
        volatile u32 dmamr0 = swab32(dma->dmamr0);
@@ -342,7 +353,7 @@ void dma_init(void)
 
 uint dma_check(void)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMRBAR;
+       volatile immap_t *immap = (immap_t *)CFG_IMMR;
        volatile dma83xx_t *dma = &immap->dma;
        volatile u32 status = swab32(dma->dmasr0);
        volatile u32 byte_count = swab32(dma->dmabcr0);
@@ -361,7 +372,7 @@ uint dma_check(void)
 
 int dma_xfer(void *dest, u32 count, void *src)
 {
-       volatile immap_t *immap = (immap_t *)CFG_IMMRBAR;
+       volatile immap_t *immap = (immap_t *)CFG_IMMR;
        volatile dma83xx_t *dma = &immap->dma;
        volatile u32 dmamr0;