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 66ed95f..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,         CONFIG_SYS_GPIO0_OR );
        out32(GPIO0_TCR,        CONFIG_SYS_GPIO0_TCR);
        out32(GPIO0_ODR,        CONFIG_SYS_GPIO0_ODR);
-       mtspr(ccr0,      0x00700000);
+       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