Simplify system ID

m-labs · May 19, 2013 · 3eb41f7 · 3eb41f7
1 parent d487dc6
commit 3eb41f7
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 127 deletions.
diff --git a/software/bios/boot.c b/software/bios/boot.c
@@ -2,7 +2,6 @@
 #include <console.h>
 #include <uart.h>
 #include <system.h>
-#include <board.h>
 #include <crc.h>
 #include <sfl.h>
 #include <string.h>

diff --git a/software/bios/main.c b/software/bios/main.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <uart.h>
 #include <system.h>
-#include <board.h>
+#include <id.h>
 #include <irq.h>
 #include <version.h>
 #include <crc.h>
@@ -515,7 +515,7 @@ int main(int i, char **c)
 	crcbios();
 	if(rescue)
 		printf("Rescue mode\n");
-	board_init();
+	id_print();
 	ethreset();
 	print_mac();
 	ddr_ok = ddrinit();

diff --git a/software/include/base/board.h b/software/include/base/board.h
diff --git a/software/include/base/id.h b/software/include/base/id.h
@@ -0,0 +1,18 @@
+#ifndef __ID_H
+#define __ID_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void get_sysid_formatted(char *sysid);
+void get_soc_version(unsigned int *major, unsigned int *minor, unsigned int *subminor, unsigned int *rc);
+void get_soc_version_formatted(char *version);
+
+void id_print(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ID_H */
diff --git a/software/libbase/Makefile b/software/libbase/Makefile
@@ -1,7 +1,7 @@
 M2DIR=../..
 include $(M2DIR)/software/common.mak
 
-OBJECTS=setjmp.o libc.o errno.o crc16.o crc32.o console.o system.o board.o uart.o qsort.o strtod.o
+OBJECTS=setjmp.o libc.o errno.o crc16.o crc32.o console.o system.o id.o uart.o qsort.o strtod.o
 
 all: libbase.a libbase-nofloat.a
 

diff --git a/software/libbase/board.c b/software/libbase/board.c
diff --git a/software/libbase/id.c b/software/libbase/id.c
@@ -0,0 +1,47 @@
+#include <hw/csr.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <version.h>
+#include <id.h>
+
+void get_sysid_formatted(char *sysid)
+{
+	sysid[0] = identifier_sysid_read() >> 8;
+	sysid[1] = identifier_sysid_read();
+	sysid[2] = 0;
+}
+
+void get_soc_version(unsigned int *major, unsigned int *minor, unsigned int *subminor, unsigned int *rc)
+{
+	unsigned int id;
+
+	id = identifier_version_read();
+	*major = (id & 0xf000) >> 12;
+	*minor = (id & 0x0f00) >> 8;
+	*subminor = (id & 0x00f0) >> 4;
+	*rc = id & 0x000f;
+}
+
+void get_soc_version_formatted(char *version)
+{
+	unsigned int major, minor, subminor, rc;
+
+	get_soc_version(&major, &minor, &subminor, &rc);
+
+	version += sprintf(version, "%u.%u", major, minor);
+	if(subminor != 0)
+		version += sprintf(version, ".%u", subminor);
+	if(rc != 0)
+		sprintf(version, "RC%u", rc);
+}
+
+void id_print(void)
+{
+	char soc_version[13];
+	char sysid[3];
+
+	get_soc_version_formatted(soc_version);
+	get_sysid_formatted(sysid);
+	printf("Running on Milkymist-ng SoC %s (sysid:%s) at %dMHz\n", soc_version, sysid, identifier_frequency_read()/1000000);
+}