git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[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
..
a9e0dce
100644
(file)
--- a/
arch/m68knommu/platform/5272/config.c
+++ b/
arch/m68knommu/platform/5272/config.c
@@
-23,7
+23,6
@@
#include <asm/mcftimer.h>
#include <asm/mcfsim.h>
#include <asm/mcfdma.h>
#include <asm/mcftimer.h>
#include <asm/mcfsim.h>
#include <asm/mcfdma.h>
-#include <asm/delay.h>
/***************************************************************************/
/***************************************************************************/
@@
-110,7
+109,7
@@
void config_BSP(char *commandp, int size)
#if defined(CONFIG_BOOTPARAM)
strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);
commandp[size-1] = 0;
#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;
/* Copy command line from FLASH to local buffer... */
memcpy(commandp, (char *) 0xf0004000, size);
commandp[size-1] = 0;
@@
-118,6
+117,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;
/* 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
#else
memset(commandp, 0, size);
#endif