From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Thu, 31 May 2012 14:30:30 +0000 (+0200)
Subject: software: merge flash.h into mem.h
X-Git-Tag: 24jan2021_ls180~3145
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a4408a88069b15ce1de5e770002b034bc75b5be;p=litex.git

software: merge flash.h into mem.h
---

diff --git a/software/bios/boot.c b/software/bios/boot.c
index aefc25a3..6d703f82 100644
--- 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 2eb1d49d..8df3cab1 100644
--- 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
index f5603906..00000000
--- 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 3142b679..f189718b 100644
--- 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 */