MIPS: Fix GCC-4.2 'discards qualifiers from pointer target type' warnings

[u-boot] / cpu / i386 / sc520.c

diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520.c
index 640b25584a5658f30c2b5460b50e46a8b1903518..b958f8dc043606b079a9dd3a25a0bed03f38b1bd 100644 (file)
--- a/cpu/i386/sc520.c
+++ b/cpu/i386/sc520.c
@@ -25,14 +25,11 @@
  * but idependent of implementation */
 
 #include <config.h>
-
-#ifdef CONFIG_SC520
-
 #include <common.h>
 #include <config.h>
 #include <pci.h>
 #ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
 #endif
 #include <asm/io.h>
 #include <asm/pci.h>
@@ -113,7 +110,7 @@ void init_sc520(void)
        write_mmcr_word(SC520_HBCTL,0x04);      /* enable posted-writes */
 
 
-       if (CFG_SC520_HIGH_SPEED) {
+       if (CONFIG_SYS_SC520_HIGH_SPEED) {
                write_mmcr_byte(SC520_CPUCTL, 0x2);     /* set it to 133 MHz and write back */
                gd->cpu_clk = 133000000;
                printf("## CPU Speed set to 133MHz\n");
@@ -145,7 +142,7 @@ unsigned long init_sc520_dram(void)
 
        u32 dram_present=0;
        u32 dram_ctrl;
-#ifdef CFG_SDRAM_DRCTMCTL
+#ifdef CONFIG_SYS_SDRAM_DRCTMCTL
        /* these memory control registers are set up in the assember part,
         * in sc520_asm.S, during 'mem_init'.  If we muck with them here,
         * after we are running a stack in RAM, we have troubles.  Besides,
@@ -156,9 +153,9 @@ unsigned long init_sc520_dram(void)
 #else
        int val;
 
-       int cas_precharge_delay = CFG_SDRAM_PRECHARGE_DELAY;
-       int refresh_rate        = CFG_SDRAM_REFRESH_RATE;
-       int ras_cas_delay       = CFG_SDRAM_RAS_CAS_DELAY;
+       int cas_precharge_delay = CONFIG_SYS_SDRAM_PRECHARGE_DELAY;
+       int refresh_rate        = CONFIG_SYS_SDRAM_REFRESH_RATE;
+       int ras_cas_delay       = CONFIG_SYS_SDRAM_RAS_CAS_DELAY;
 
        /* set SDRAM speed here */
 
@@ -344,7 +341,7 @@ void pci_sc520_init(struct pci_controller *hose)
                       SC520_PCI_MEMORY_BUS,
                       SC520_PCI_MEMORY_PHYS,
                       SC520_PCI_MEMORY_SIZE,
-                      PCI_REGION_MEM | PCI_REGION_MEMORY);
+                      PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
 
        /* PCI memory space */
        pci_set_region(hose->regions + 1,
@@ -393,7 +390,7 @@ void pci_sc520_init(struct pci_controller *hose)
 
 #endif
 
-#ifdef CFG_TIMER_SC520
+#ifdef CONFIG_SYS_TIMER_SC520
 
 
 void reset_timer(void)
@@ -507,4 +504,13 @@ u8 ssi_rx_byte(void)
        return read_mmcr_byte(SC520_SSIRCV);
 }
 
-#endif /* CONFIG_SC520 */
+#ifdef CONFIG_SYS_RESET_SC520
+void reset_cpu(ulong addr)
+{
+       printf("Resetting using SC520 MMCR\n");
+       /* Write a '1' to the SYS_RST of the RESCFG MMCR */
+       write_mmcr_word(SC520_RESCFG, 0x0001);
+
+       /* NOTREACHED */
+}
+#endif