This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
edb7211 flash mapping
- From: Jani Monoses <jani at iv dot ro>
- To: ecos-patches at sources dot redhat dot com
- Date: Wed, 28 Aug 2002 17:07:35 +0000
- Subject: edb7211 flash mapping
On the EDB7211 there are 16megs of NOR flash (and no NAND as the docs suggest)
the two 8M blocks are on different chip selects
This patch makes them map contiguously otherwise fis commands or any flash access
beyond 8M of the advertised 16 wraps.
for the rest of the variants (edb7212,etc...) nothing is changed.
Also turn an #if into #ifdef to avoid a compiler warning
Index: hal/arm/edb7xxx/current//ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/edb7xxx/current/ChangeLog,v
retrieving revision 1.37
diff -u -r1.37 ChangeLog
--- hal/arm/edb7xxx/current//ChangeLog 2 Aug 2002 12:59:40 -0000 1.37
+++ hal/arm/edb7xxx/current//ChangeLog 28 Aug 2002 13:55:18 -0000
@@ -1,3 +1,10 @@
+2002-08-28 Jani Monoses <jani@iv.ro>
+
+ * include/pkgconf/mlt_arm_edb7211_rom.h:
+ * include/pkgconf/mlt_arm_edb7211_rom.ldi:
+ * include/hal_platform_setup.h: map all 16M of flash correctly
+ as a contiguous block on the EDB7211 instead of just 8M.
+
2002-08-02 Gary Thomas <gary@chez-thomas.org>
* cdl/hal_arm_edb7xxx.cdl: Clean up CDL.
Index: hal/arm/edb7xxx/current//include/hal_platform_setup.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/edb7xxx/current/include/hal_platform_setup.h,v
retrieving revision 1.14
diff -u -r1.14 hal_platform_setup.h
--- hal/arm/edb7xxx/current//include/hal_platform_setup.h 23 May 2002 23:01:58 -0000 1.14
+++ hal/arm/edb7xxx/current//include/hal_platform_setup.h 28 Aug 2002 13:55:27 -0000
@@ -98,12 +98,16 @@
#define LCD_LA_START 0xC0000000
#define LCD_LA_END 0xC0020000
#define LCD_PA 0xC0000000
-#define ROM0_LA_START 0xE0000000
#define ROM0_PA 0x00000000
+#define ROM1_PA 0x10000000
+#define ROM0_LA_START 0xE0000000
+#if defined (__EDB7211)
+#define ROM0_LA_END 0xE0800000
+#else
#define ROM0_LA_END 0xF0000000
-#define ROM1_LA_START 0xF0000000
+#endif
+#define ROM1_LA_START ROM0_LA_END
#define ROM1_LA_END 0x00000000
-#define ROM1_PA 0x10000000
#define EXPANSION2_LA_START 0x20000000
#define EXPANSION2_PA 0x20000000
#define EXPANSION3_LA_START 0x30000000
@@ -283,7 +287,7 @@
str r2,[r1]
.endm
#else
-#if CYGHWR_HAL_ARM_EDB7XXX_VARIANT_EP7209
+#ifdef CYGHWR_HAL_ARM_EDB7XXX_VARIANT_EP7209
// No DRAM controller
.macro INIT_MEMORY_CONFIG
/* Initialize memory configuration */
Index: hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/edb7xxx/current/include/pkgconf/mlt_arm_edb7211_rom.h,v
retrieving revision 1.4
diff -u -r1.4 mlt_arm_edb7211_rom.h
--- hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.h 23 Oct 2000 17:11:14 -0000 1.4
+++ hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.h 28 Aug 2002 13:55:27 -0000
@@ -14,7 +14,7 @@
#define CYGMEM_REGION_sram_SIZE (0x9c00)
#define CYGMEM_REGION_sram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
#define CYGMEM_REGION_rom (0xe0000000)
-#define CYGMEM_REGION_rom_SIZE (0x800000)
+#define CYGMEM_REGION_rom_SIZE (0x1000000)
#define CYGMEM_REGION_rom_ATTR (CYGMEM_REGION_ATTR_R)
#ifndef __ASSEMBLER__
extern char CYG_LABEL_NAME (__heap1) [];
Index: hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/edb7xxx/current/include/pkgconf/mlt_arm_edb7211_rom.ldi,v
retrieving revision 1.5
diff -u -r1.5 mlt_arm_edb7211_rom.ldi
--- hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.ldi 23 Oct 2000 17:11:14 -0000 1.5
+++ hal/arm/edb7xxx/current//include/pkgconf/mlt_arm_edb7211_rom.ldi 28 Aug 2002 13:55:28 -0000
@@ -8,7 +8,7 @@
{
ram : ORIGIN = 0, LENGTH = 0xfd7000
sram : ORIGIN = 0x60000000, LENGTH = 0x9c00
- rom : ORIGIN = 0xe0000000, LENGTH = 0x800000
+ rom : ORIGIN = 0xe0000000, LENGTH = 0x1000000
}
SECTIONS