fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / m68knommu / platform / 5272 / config.c

diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index e325c19..d500e27 100644 (file)
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -9,7 +9,6 @@
 
 /***************************************************************************/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/param.h>
@@ -23,7 +22,6 @@
 #include <asm/mcftimer.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfdma.h>
-#include <asm/delay.h>
 
 /***************************************************************************/
 
@@ -39,6 +37,14 @@ extern unsigned int mcf_timerlevel;
 
 /***************************************************************************/
 
+/*
+ *     Some platforms need software versions of the GPIO data registers.
+ */
+unsigned short ppdata;
+unsigned char ledbank = 0xff;
+
+/***************************************************************************/
+
 /*
  *     DMA channel base address table.
  */
@@ -97,11 +103,11 @@ int mcf_timerirqpending(int timer)
 
 void config_BSP(char *commandp, int size)
 {
-#if 0
-       volatile unsigned long  *pivrp;
+#if defined (CONFIG_MOD5272)
+       volatile unsigned char  *pivrp;
 
        /* Set base of device vectors to be 64 */
-       pivrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PIVR);
+       pivrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_PIVR);
        *pivrp = 0x40;
 #endif
 
@@ -110,7 +116,7 @@ void config_BSP(char *commandp, int size)
 #if defined(CONFIG_BOOTPARAM)
        strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);
        commandp[size-1] = 0;
-#elif defined(CONFIG_NETtel)
+#elif defined(CONFIG_NETtel) || defined(CONFIG_SCALES)
        /* Copy command line from FLASH to local buffer... */
        memcpy(commandp, (char *) 0xf0004000, size);
        commandp[size-1] = 0;
@@ -118,6 +124,10 @@ void config_BSP(char *commandp, int size)
        /* Copy command line from FLASH to local buffer... */
        memcpy(commandp, (char *) 0xffe06000, size);
        commandp[size-1] = 0;
+#elif defined(CONFIG_CANCam)
+       /* Copy command line from FLASH to local buffer... */
+       memcpy(commandp, (char *) 0xf0010000, size);
+       commandp[size-1] = 0;
 #else
        memset(commandp, 0, size);
 #endif