software: merge flash.h into mem.h

This commit is contained in:
Sebastien Bourdeauducq 2012-05-31 16:30:30 +02:00
parent 8d63c249e3
commit 3a4408a880
4 changed files with 14 additions and 19 deletions
software

View file

@ -9,7 +9,6 @@
#include <irq.h>
#include <timer.h>
#include <hw/flash.h>
#include <hw/mem.h>
#include "microudp.h"

View file

@ -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"

View file

@ -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 */

View file

@ -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 */