Merge with /home/tur/git/u-boot#cm5200-si

[karo-tx-uboot.git] / board / ep8260 / ep8260.c

diff --git a/board/ep8260/ep8260.c b/board/ep8260/ep8260.c
index a49c53e7c4d2f0ff66e2a48774c528517bc93669..b9e1df43d75848dfa1e0cd4e874081894179ba2f 100644 (file)
--- a/board/ep8260/ep8260.c
+++ b/board/ep8260/ep8260.c
@@ -188,23 +188,24 @@ const iop_conf_t iop_conf_tab[4][32] = {
  * Setup CS4 to enable the Board Control/Status registers.
  * Otherwise the smcs won't work.
 */
-int board_pre_init (void)
+int board_early_init_f (void)
 {
-    volatile t_ep_regs *regs = (t_ep_regs*)CFG_REGS_BASE;
-    volatile immap_t *immap  = (immap_t *)CFG_IMMR;
-    volatile memctl8260_t *memctl = &immap->im_memctl;
-    memctl->memc_br4 = CFG_BR4_PRELIM;
-    memctl->memc_or4 = CFG_OR4_PRELIM;
-    regs->bcsr1 = 0x62; /* to enable terminal on SMC1 */
-    regs->bcsr2 = 0x30;        /* enable NVRAM and writing FLASH */
-    return 0;
+       volatile t_ep_regs *regs = (t_ep_regs *) CFG_REGS_BASE;
+       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile memctl8260_t *memctl = &immap->im_memctl;
+
+       memctl->memc_br4 = CFG_BR4_PRELIM;
+       memctl->memc_or4 = CFG_OR4_PRELIM;
+       regs->bcsr1 = 0x62;     /* to enable terminal on SMC1 */
+       regs->bcsr2 = 0x30;     /* enable NVRAM and writing FLASH */
+       return 0;
 }
 
-void
-reset_phy(void)
+void reset_phy (void)
 {
-    volatile t_ep_regs *regs = (t_ep_regs*)CFG_REGS_BASE;
-    regs->bcsr4 = 0xC0;
+       volatile t_ep_regs *regs = (t_ep_regs *) CFG_REGS_BASE;
+
+       regs->bcsr4 = 0xC0;
 }
 
 /*
@@ -213,15 +214,25 @@ reset_phy(void)
  * Thats why its a static interpretation ...
 */
 
-int
-checkboard(void)
+int checkboard (void)
 {
-       volatile t_ep_regs *regs = (t_ep_regs*)CFG_REGS_BASE;
-       uint major=0, minor=0;
+       volatile t_ep_regs *regs = (t_ep_regs *) CFG_REGS_BASE;
+       uint major = 0, minor = 0;
+
        switch (regs->bcsr0) {
-               case 0x02: major = 1; break;
-               case 0x03: major = 1; minor = 1; break;
-               default: break;
+       case 0x02:
+               major = 1;
+               break;
+       case 0x03:
+               major = 1;
+               minor = 1;
+               break;
+       case 0x06:
+               major = 1;
+               minor = 3;
+               break;
+       default:
+               break;
        }
        printf ("Board: Embedded Planet EP8260, Revision %d.%d\n",
                major, minor);
@@ -232,13 +243,13 @@ checkboard(void)
 /* ------------------------------------------------------------------------- */
 
 
-long int
-initdram(int board_type)
+long int initdram (int board_type)
 {
-       volatile immap_t *immap  = (immap_t *)CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
        volatile uchar c = 0;
-       volatile uchar *ramaddr = (uchar *)(CFG_SDRAM_BASE) + 0x110;
+       volatile uchar *ramaddr = (uchar *) (CFG_SDRAM_BASE) + 0x110;
+
 /*
        ulong psdmr = CFG_PSDMR;
 #ifdef CFG_LSDRAM
@@ -288,7 +299,7 @@ initdram(int board_type)
 #ifndef CFG_RAMBOOT
 #ifdef CFG_LSDRAM
        size += CFG_SDRAM1_SIZE;
-       ramaddr = (uchar *)(CFG_SDRAM1_BASE) + 0x8c;
+       ramaddr = (uchar *) (CFG_SDRAM1_BASE) + 0x8c;
        memctl->memc_lsrt = CFG_LSRT;
 
        memctl->memc_lsdmr = (ulong) CFG_LSDMR | PSDMR_OP_PREA;