sc520: Move board specific settings to board init function

diff --git a/arch/i386/cpu/sc520/sc520.c b/arch/i386/cpu/sc520/sc520.c
index 7caa4c8a6cfd7b6246592e8de5988fb905a95575..19a678dfe300473c0ea14609ea2f9628bad20acb 100644 (file)
--- a/arch/i386/cpu/sc520/sc520.c
+++ b/arch/i386/cpu/sc520/sc520.c
@@ -42,25 +42,6 @@ sc520_mmcr_t *sc520_mmcr = (sc520_mmcr_t *)SC520_MMCR_BASE;
 
 int cpu_init_f(void)
 {
-       /*
-        * Set the UARTxCTL register at it's slower,
-        * baud clock giving us a 1.8432 MHz reference
-        */
-       writeb(0x07, &sc520_mmcr->uart1ctl);
-       writeb(0x07, &sc520_mmcr->uart2ctl);
-
-       /* first set the timer pin mapping */
-       writeb(0x72, &sc520_mmcr->clksel);      /* no clock frequency selected, use 1.1892MHz */
-
-       /* enable PCI bus arbiter (concurrent mode) */
-       writeb(0x02, &sc520_mmcr->sysarbctl);
-
-       /* enable external grants */
-       writeb(0x1f, &sc520_mmcr->sysarbmenb);
-
-       /* enable posted-writes */
-       writeb(0x04, &sc520_mmcr->hbctl);
-
        if (CONFIG_SYS_SC520_HIGH_SPEED) {
                /* set it to 133 MHz and write back */
                writeb(0x02, &sc520_mmcr->cpuctl);

diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
index 30d8750d7616209b7a0c502850637a24de6abb75..b2f349f988509d938046f18f1801d0e45029f84a 100644 (file)
--- a/board/eNET/eNET.c
+++ b/board/eNET/eNET.c
@@ -94,12 +94,21 @@ int board_early_init_f(void)
        writew(0x0615, &sc520_mmcr->romcs1ctl);
        writew(0x0615, &sc520_mmcr->romcs2ctl);
 
+       /*
+        * Set the timer pin mapping
+        * no clock frequency selected, use 1.1892MHz
+        */
+       writeb(0x72, &sc520_mmcr->clksel);
+
        writeb(0x00, &sc520_mmcr->adddecctl);
        writeb(0x07, &sc520_mmcr->uart1ctl);
        writeb(0x07, &sc520_mmcr->uart2ctl);
        writeb(0x06, &sc520_mmcr->sysarbctl);
        writew(0x0003, &sc520_mmcr->sysarbmenb);
 
+       /* enable posted-writes */
+       writeb(0x04, &sc520_mmcr->hbctl);
+
        return 0;
 }