From 26c5a8a9260891d474b5f6a05380c72a257871e1 Mon Sep 17 00:00:00 2001
From: Michal Sieron <msieron@internships.antmicro.com>
Date: Wed, 11 Aug 2021 11:12:12 +0200
Subject: [PATCH] Move libbase/id.c to bios/cmd/cmd_bios.c

---
 litex/soc/software/bios/cmds/cmd_bios.c | 11 +++++++++--
 litex/soc/software/bios/main.c          |  1 -
 litex/soc/software/include/base/id.h    | 15 ---------------
 litex/soc/software/libbase/Makefile     |  1 -
 litex/soc/software/libbase/id.c         | 18 ------------------
 5 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 litex/soc/software/include/base/id.h
 delete mode 100644 litex/soc/software/libbase/id.c

diff --git a/litex/soc/software/bios/cmds/cmd_bios.c b/litex/soc/software/bios/cmds/cmd_bios.c
index 1e9d76971..25c69f602 100644
--- a/litex/soc/software/bios/cmds/cmd_bios.c
+++ b/litex/soc/software/bios/cmds/cmd_bios.c
@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <base/id.h>
 #include <base/crc.h>
 #include <system.h>
 #include <base/sim_debug.h>
@@ -48,9 +47,17 @@ define_command(help, help_handler, "Print this help", SYSTEM_CMDS);
  */
 static void ident_handler(int nb_params, char **params)
 {
+	const int IDENT_SIZE = 256;
 	char buffer[IDENT_SIZE];
 
-	get_ident(buffer);
+#ifdef CSR_IDENTIFIER_MEM_BASE
+	int i;
+	for(i=0;i<IDENT_SIZE;i++)
+		buffer[i] = MMPTR(CSR_IDENTIFIER_MEM_BASE + CONFIG_CSR_ALIGNMENT/8*i);
+#else
+	buffer[0] = 0;
+#endif
+
 	printf("Ident: %s", *buffer ? buffer : "-");
 }
 
diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
index 66d0b0082..3519cfecb 100644
--- a/litex/soc/software/bios/main.c
+++ b/litex/soc/software/bios/main.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <base/uart.h>
 #include <system.h>
-#include <base/id.h>
 #include <irq.h>
 #include <base/crc.h>
 
diff --git a/litex/soc/software/include/base/id.h b/litex/soc/software/include/base/id.h
deleted file mode 100644
index bccbd5587..000000000
--- a/litex/soc/software/include/base/id.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ID_H
-#define __ID_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IDENT_SIZE 256
-void get_ident(char *ident);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ID_H */
diff --git a/litex/soc/software/libbase/Makefile b/litex/soc/software/libbase/Makefile
index 95e97ce0b..2b255aa5d 100755
--- a/litex/soc/software/libbase/Makefile
+++ b/litex/soc/software/libbase/Makefile
@@ -5,7 +5,6 @@ OBJECTS = exception.o \
 	crc16.o           \
 	crc32.o           \
 	system.o          \
-	id.o              \
 	uart.o            \
 	spiflash.o        \
 	i2c.o             \
diff --git a/litex/soc/software/libbase/id.c b/litex/soc/software/libbase/id.c
deleted file mode 100644
index c572ea2e1..000000000
--- a/litex/soc/software/libbase/id.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <generated/csr.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <base/id.h>
-
-#define DFII_ADDR_SHIFT CONFIG_CSR_ALIGNMENT/8
-
-void get_ident(char *ident)
-{
-#ifdef CSR_IDENTIFIER_MEM_BASE
-    int i;
-    for(i=0;i<256;i++)
-        ident[i] = MMPTR(CSR_IDENTIFIER_MEM_BASE + DFII_ADDR_SHIFT*i);
-#else
-    ident[0] = 0;
-#endif
-}