sparc,sparc64: unify kernel/

o Move all files from sparc64/kernel/ to sparc/kernel
  - rename as appropriate
o Update sparc/Makefile to the changes
o Update sparc/kernel/Makefile to include the sparc64 files

NOTE: This commit changes link order on sparc64!

Link order had to change for either of sparc32 and sparc64.
And assuming sparc64 see more testing than sparc32 change link
order on sparc64 where issues will be caught faster.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 49 insertions, 0 deletions

diff --git a/arch/sparc/kernel/idprom_64.c b/arch/sparc/kernel/idprom_64.c
new file mode 100644
index 000000000000..5b45a808c621
--- /dev/null
+++ b/arch/sparc/kernel/idprom_64.c
@@ -0,0 +1,49 @@
+/*
+ * idprom.c: Routines to load the idprom into kernel addresses and
+ *           interpret the data contained within.
+ *
+ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+
+#include <asm/oplib.h>
+#include <asm/idprom.h>
+
+struct idprom *idprom;
+static struct idprom idprom_buffer;
+
+/* Calculate the IDPROM checksum (xor of the data bytes). */
+static unsigned char __init calc_idprom_cksum(struct idprom *idprom)
+{
+        unsigned char cksum, i, *ptr = (unsigned char *)idprom;
+
+        for (i = cksum = 0; i <= 0x0E; i++)
+                cksum ^= *ptr++;
+
+        return cksum;
+}
+
+/* Create a local IDPROM copy and verify integrity. */
+void __init idprom_init(void)
+{
+        prom_get_idprom((char *) &idprom_buffer, sizeof(idprom_buffer));
+
+        idprom = &idprom_buffer;
+
+        if (idprom->id_format != 0x01)  {
+                prom_printf("IDPROM: Warning, unknown format type!\n");
+        }
+
+        if (idprom->id_cksum != calc_idprom_cksum(idprom)) {
+                prom_printf("IDPROM: Warning, checksum failure (nvram=%x, calc=%x)!\n",
+                            idprom->id_cksum, calc_idprom_cksum(idprom));
+        }
+
+        printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+               idprom->id_ethaddr[0], idprom->id_ethaddr[1],
+               idprom->id_ethaddr[2], idprom->id_ethaddr[3],
+               idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
+}