ppc4xx: Replace 4xx lowercase SPR references

[karo-tx-uboot.git] / board / netstal / mcu25 / mcu25.c

diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index 07891f6785a83844c9780d031c23cbb7199f088b..67c1b0bbeaca7486328bccc787d51290aaea01a5 100644 (file)
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -74,10 +74,10 @@ int board_early_init_f (void)
        mtdcr(cntrl1, CPC0_CR1_VALUE);
        mtdcr(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;
 }
@@ -141,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;
@@ -161,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);