ppc4xx: Big cleanup of PPC4xx defines

[platform/kernel/u-boot.git] / board / netstal / mcu25 / mcu25.c

diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index 2b21444..9054282 100644 (file)
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -71,13 +71,13 @@ int board_early_init_f (void)
        mtdcr(uictr, 0x00000000); /* set int trigger levels */
        mtdcr(uicsr, 0xFFFFFFFF); /* clear all ints */
 
-       mtdcr(cntrl1, CPC0_CR1_VALUE);
-       mtdcr(ecr, 0x60606000);
+       mtdcr(CPC0_CR1, CPC0_CR1_VALUE);
+       mtdcr(CPC0_ECR, 0x60606000);
        mtdcr(CPC0_EIRR, 0x7C000000);
-       out32(GPIO0_OR,         CFG_GPIO0_OR );
-       out32(GPIO0_TCR,        CFG_GPIO0_TCR);
-       out32(GPIO0_ODR,        CFG_GPIO0_ODR);
-       mtspr(ccr0,      0x00700000);
+       out32(GPIO0_OR,         CONFIG_SYS_GPIO0_OR );
+       out32(GPIO0_TCR,        CONFIG_SYS_GPIO0_TCR);
+       out32(GPIO0_ODR,        CONFIG_SYS_GPIO0_ODR);
+       mtspr(SPRN_CCR0,      0x00700000);
 
        return 0;
 }
@@ -103,7 +103,7 @@ int checkboard (void)
        u16 index      = boardVersReg & 0xf0;
 
        /* Cannot be done in board_early_init */
-       mtdcr(cntrl0,  CPC0_CR0_VALUE);
+       mtdcr(CPC0_CR0,  CPC0_CR0_VALUE);
 
        /* Force /RTS to active. The board it not wired quite
         * correctly to use cts/rtc flow control, so just force the
@@ -128,15 +128,6 @@ void hcu_led_set(u32 value)
 }
 
 /*
- * sdram_init - Dummy implementation for start.S, spd_sdram  or initdram
- *             used for HCUx
- */
-void sdram_init(void)
-{
-       return;
-}
-
-/*
  * hcu_get_slot
  */
 u32 hcu_get_slot(void)
@@ -150,7 +141,7 @@ u32 hcu_get_slot(void)
  */
 u32 get_serial_number(void)
 {
-       u32 serial = in_be32((u32 *)CFG_FLASH_BASE);
+       u32 serial = in_be32((u32 *)CONFIG_SYS_FLASH_BASE);
 
        if (serial == 0xffffffff)
                return 0;
@@ -170,7 +161,7 @@ int misc_init_r(void)
        return 0;
 }
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        unsigned int dram_size = 64*1024*1024;
        init_ppc405_sdram(dram_size);