software: merge flash.h into mem.h

diff --git a/software/bios/boot.c b/software/bios/boot.c
index aefc25a31ccf826af4bb9a9e9d6205cf95be2d39..6d703f82a4e7d8217d09dc4f0aee15735ca02730 100644 (file)
--- a/software/bios/boot.c
+++ b/software/bios/boot.c
@@ -9,7 +9,6 @@
 #include <irq.h>
 #include <timer.h>
 
-#include <hw/flash.h>
 #include <hw/mem.h>
 
 #include "microudp.h"

diff --git a/software/bios/main.c b/software/bios/main.c
index 2eb1d49de1194f367273fc2495b687034da41087..8df3cab1d46983d83241ac418d8eb7e55729cba3 100644 (file)
--- a/software/bios/main.c
+++ b/software/bios/main.c
@@ -10,7 +10,7 @@
 #include <crc.h>
 #include <timer.h>
 
-#include <hw/flash.h>
+#include <hw/mem.h>
 #include <hw/minimac.h>
 
 #include "ddrinit.h"

diff --git a/software/include/hw/flash.h b/software/include/hw/flash.h
deleted file mode 100644 (file)
index f560390..0000000
--- a/software/include/hw/flash.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __HW_FLASH_H
-#define __HW_FLASH_H
-
-#define FLASH_OFFSET_STANDBY_BITSTREAM (0x00000000) /* 640k */
-
-#define FLASH_OFFSET_RESCUE_BITSTREAM  (0x000A0000) /* 1536k */
-#define FLASH_OFFSET_RESCUE_BIOS       (0x00220000) /* 128k */
-#define FLASH_OFFSET_RESCUE_APP                (0x00240000) /* 4736k */
-
-#define FLASH_OFFSET_REGULAR_BITSTREAM (0x006E0000) /* 1536k */
-#define FLASH_OFFSET_REGULAR_BIOS      (0x00860000) /* 128k */
-#define FLASH_OFFSET_REGULAR_APP       (0x00880000) /* remaining space (24064k) */
-
-#define FLASH_OFFSET_MAC_ADDRESS       (0x002200E0) /* within rescue BIOS */
-
-#endif /* __HW_FLASH_H */

diff --git a/software/include/hw/mem.h b/software/include/hw/mem.h
index 3142b6796defa1a1665dacfca6f69532526187ac..f189718bd3e32116df7d7d698c7598d9196393e8 100644 (file)
--- a/software/include/hw/mem.h
+++ b/software/include/hw/mem.h
@@ -1,6 +1,18 @@
 #ifndef __HW_MEM_H
 #define __HW_MEM_H
 
-#define SDRAM_BASE             (0x40000000)
+#define FLASH_OFFSET_STANDBY_BITSTREAM 0x00000000 /* 640k */
+
+#define FLASH_OFFSET_RESCUE_BITSTREAM  0x000A0000 /* 1536k */
+#define FLASH_OFFSET_RESCUE_BIOS       0x00220000 /* 128k */
+#define FLASH_OFFSET_RESCUE_APP                0x00240000 /* 4736k */
+
+#define FLASH_OFFSET_REGULAR_BITSTREAM 0x006E0000 /* 1536k */
+#define FLASH_OFFSET_REGULAR_BIOS      0x00860000 /* 128k */
+#define FLASH_OFFSET_REGULAR_APP       0x00880000 /* remaining space (24064k) */
+
+#define FLASH_OFFSET_MAC_ADDRESS       0x002200E0 /* within rescue BIOS */
+
+#define SDRAM_BASE                     0x40000000
 
 #endif /* __HW_MEM_H */