summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--polux/devkit/plc-polux/core/linux_drv.c12
-rw-r--r--polux/devkit/plc-polux/core/plc_proc.c5
2 files changed, 14 insertions, 3 deletions
diff --git a/polux/devkit/plc-polux/core/linux_drv.c b/polux/devkit/plc-polux/core/linux_drv.c
index e4f36bf1e3..4f27978e06 100644
--- a/polux/devkit/plc-polux/core/linux_drv.c
+++ b/polux/devkit/plc-polux/core/linux_drv.c
@@ -100,8 +100,10 @@
* SECTION 2 : Local DEFINE
*/
MODULE_AUTHOR ("SPiDCOM Technologies");
-#if defined(SP_LISA) || defined(CONFIG_ARCH_MSE500)
+#if defined(SP_LISA)
MODULE_DESCRIPTION ("SPK200c PLC driver");
+#elif defined(CONFIG_ARCH_MSE500)
+MODULE_DESCRIPTION ("MSE500 PLC driver");
#else
MODULE_DESCRIPTION ("SPK200e PLC driver");
#endif
@@ -1571,10 +1573,14 @@ static void read_nvram (char *plcPhysAddress)
}
else
{
+#if 0
printk("Invalid NVRAM\n");
board_version_set = 0;
serial_number_set = 0;
memset (plcPhysAddress, 0, sizeof (nvram.plcPhysAddress));
+#endif
+ char mac_address[6] = { 0x00, 0x13, 0xD7, 0x10, 0x00, 0x01 };
+ memcpy (plcPhysAddress, mac_address, 6);
}
}
@@ -1621,8 +1627,10 @@ static int __init plc_drv_init (struct net_device *dev)
memset (bootVersionString, 0, 32);
bootVersionString[0] = 'v';
-#if defined(SP_LISA) || defined(CONFIG_ARCH_MSE500)
+#if defined(SP_LISA)
strncpy (&bootVersionString[1], (char *) 0x08000020, 31);
+#elif defined(CONFIG_ARCH_MSE500)
+ /* Nothing to do. */
#else
strncpy (&bootVersionString[1], (char *) 0x0e000020, 31);
#endif
diff --git a/polux/devkit/plc-polux/core/plc_proc.c b/polux/devkit/plc-polux/core/plc_proc.c
index 6ec6365520..344774cc77 100644
--- a/polux/devkit/plc-polux/core/plc_proc.c
+++ b/polux/devkit/plc-polux/core/plc_proc.c
@@ -2161,9 +2161,12 @@ int proc_r_software_build (char *buf, char **start, off_t offset, int count, int
#ifdef CONFIG_TINA_C
p += sprintf (p, "target: TINA_C\n");
#endif
-#if defined(SP_LISA) || defined(CONFIG_ARCH_MSE500)
+#ifdef SP_LISA
p += sprintf (p, "target: LISA\n");
#endif
+#ifdef CONFIG_ARCH_MSE500
+ p += sprintf (p, "target: MSE500\n");
+#endif
// Option found inside .config file in linux directory.
#ifdef CONFIG_SLAVE