This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
edb7212 flash size bug
- From: Jani Monoses <jani at iv dot ro>
- To: ecos-patches at sources dot redhat dot com
- Date: Thu, 27 Mar 2003 19:24:31 +0200
- Subject: edb7212 flash size bug
Hi
this is a rediff/resend of a patch from August 2002
the edb7212 has 16Megs of flash but it's not contiguous
fi init -f overwrites redboot because it wraps after 8Megs.
the patch correctly sets the limits of the two blocks
sets the flash size to 16 in the linker script and changes an #if to #ifdef
to avoid a gcc warning
Jani
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.15
diff -u -r1.15 hal_platform_setup.h
--- hal/arm/edb7xxx/current/include//hal_platform_setup.h 7 Feb 2003 00:25:01 -0000 1.15
+++ hal/arm/edb7xxx/current/include//hal_platform_setup.h 27 Mar 2003 09:01:10 -0000
@@ -101,8 +101,12 @@
#define LCD_PA 0xC0000000
#define ROM0_LA_START 0xE0000000
#define ROM0_PA 0x00000000
+#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
@@ -262,7 +266,6 @@
mcr MMU_CP,0,r1,MMU_FlushIDC,c0,0 /* Invalidate Caches */
.endm
#endif // CYG_HAL_STARTUP_RAM
-
#ifdef CYGHWR_HAL_ARM_EDB7XXX_VARIANT_EP7312
.macro INIT_MEMORY_CONFIG
mov r0,#(CPSR_IRQ_DISABLE|CPSR_FIQ_DISABLE|CPSR_SUPERVISOR_MODE)
@@ -284,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 27 Mar 2003 09:01:10 -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 27 Mar 2003 09:01:10 -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