software/bios: move hw flags definitions to respective libs, remove hw/flags.h.

litex/soc/software/include/base/uart.h

@@ -5,6 +5,9 @@
 extern "C" {
 #endif
 
+#define UART_EV_TX	0x1
+#define UART_EV_RX	0x2
+
 void uart_init(void);
 void uart_isr(void);
 void uart_sync(void);

litex/soc/software/include/hw/flags.h

@@ -1,40 +0,0 @@
-#ifndef __HW_FLAGS_H
-#define __HW_FLAGS_H
-
-#define UART_EV_TX	0x1
-#define UART_EV_RX	0x2
-
-#define DFII_CONTROL_SEL		0x01
-#define DFII_CONTROL_CKE		0x02
-#define DFII_CONTROL_ODT		0x04
-#define DFII_CONTROL_RESET_N	0x08
-
-#define DFII_COMMAND_CS		0x01
-#define DFII_COMMAND_WE		0x02
-#define DFII_COMMAND_CAS	0x04
-#define DFII_COMMAND_RAS	0x08
-#define DFII_COMMAND_WRDATA	0x10
-#define DFII_COMMAND_RDDATA	0x20
-
-#define ETHMAC_EV_SRAM_WRITER	0x1
-#define ETHMAC_EV_SRAM_READER	0x1
-
-#define CLKGEN_STATUS_BUSY		0x1
-#define CLKGEN_STATUS_PROGDONE	0x2
-#define CLKGEN_STATUS_LOCKED	0x4
-
-#define DVISAMPLER_TOO_LATE		0x1
-#define DVISAMPLER_TOO_EARLY	0x2
-
-#define DVISAMPLER_DELAY_MASTER_CAL	0x01
-#define DVISAMPLER_DELAY_MASTER_RST	0x02
-#define DVISAMPLER_DELAY_SLAVE_CAL	0x04
-#define DVISAMPLER_DELAY_SLAVE_RST	0x08
-#define DVISAMPLER_DELAY_INC		0x10
-#define DVISAMPLER_DELAY_DEC		0x20
-
-#define DVISAMPLER_SLOT_EMPTY	0
-#define DVISAMPLER_SLOT_LOADED	1
-#define DVISAMPLER_SLOT_PENDING	2
-
-#endif /* __HW_FLAGS_H */

litex/soc/software/libbase/exception.c

@@ -6,8 +6,6 @@ void isr(void);
 
 #ifdef __or1k__
 
-#include <hw/flags.h>
-
 #define EXTERNAL_IRQ 0x8
 
 static void emerg_printf(const char *fmt, ...)

litex/soc/software/libbase/uart.c

@@ -1,7 +1,6 @@
 #include <uart.h>
 #include <irq.h>
 #include <generated/csr.h>
-#include <hw/flags.h>
 
 /*
  * Buffer sizes must be a power of 2 so that modulos can be computed

litex/soc/software/liblitedram/sdram.c

@@ -17,7 +17,6 @@
 #include <generated/sdram_phy.h>
 #endif
 #include <generated/mem.h>
-#include <hw/flags.h>
 #include <system.h>
 
 #include "sdram.h"

litex/soc/software/libliteeth/udp.c

@@ -14,7 +14,6 @@
 #include <inet.h>
 #include <system.h>
 #include <crc.h>
-#include <hw/flags.h>
 
 #include "udp.h"
 

litex/soc/software/libliteeth/udp.h

@@ -1,6 +1,9 @@
 #ifndef __UDP_H
 #define __UDP_H
 
+#define ETHMAC_EV_SRAM_WRITER	0x1
+#define ETHMAC_EV_SRAM_READER	0x1
+
 #define IPTOINT(a, b, c, d) ((a << 24)|(b << 16)|(c << 8)|d)
 
 #define UDP_BUFSIZE (5*1532)

litex/soc/software/liblitesdcard/sdcard.c

@@ -10,7 +10,6 @@
 
 #include <generated/csr.h>
 #include <generated/mem.h>
-#include <hw/flags.h>
 #include <system.h>
 
 #include "sdcard.h"

litex/soc/software/liblitesdcard/sdcard.h

@@ -6,6 +6,10 @@
 
 #include <generated/csr.h>
 
+#define CLKGEN_STATUS_BUSY		0x1
+#define CLKGEN_STATUS_PROGDONE	0x2
+#define CLKGEN_STATUS_LOCKED	0x4
+
 #ifdef CSR_SDCORE_BASE
 
 #define SD_OK         0