Mercurial > ecos-v2_0-branch

changeset 550:bedc0ec92536

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RAM size tweak
author msalter
date Thu, 30 Jan 2003 14:47:52 +0000
parents 7002f6e48db9
children 4ecc6abc8be2
files packages/hal/arm/xscale/iq80310/current/ChangeLog packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.h packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.ldi packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.mlt packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.h packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.ldi packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.mlt packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.h packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.ldi packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.mlt packages/hal/arm/xscale/iq80321/current/ChangeLog packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.h packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.ldi packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.mlt packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.h packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.ldi packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.h packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.ldi packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.mlt packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.h packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.ldi
diffstat 21 files changed, 36 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/iq80310/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80310/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-30  Mark Salter  <msalter@redhat.com>
+
+	* include/pkgconf/mlt_*: Adjust RAM size to match max supported.
+	Actual size of installed RAM determined at runtime.
+	
 2003-01-22  Mark Salter  <msalter@redhat.com>
 
 	* src/diag/diag.c: Don't define DEFINE_VARS.
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.h
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.h
@@ -8,15 +8,10 @@
 
 #endif
 #define CYGMEM_REGION_ram (0xA0000000)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #ifndef __ASSEMBLER__
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0xa2000000 - (size_t) CYG_LABEL_NAME (__heap1))
-#ifndef __ASSEMBLER__
-extern char CYG_LABEL_NAME (__pci_window) [];
-#endif
-//#define CYGMEM_SECTION_pci_window (CYG_LABEL_NAME (__pci_window))
-//#define CYGMEM_SECTION_pci_window_SIZE (0x100000)
+#define CYGMEM_SECTION_heap1_SIZE (0xc0000000 - (size_t) CYG_LABEL_NAME (__heap1))
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.ldi
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.ldi
@@ -7,7 +7,7 @@
 MEMORY
 {
     vrom : ORIGIN = 0x00000000, LENGTH = 0x1000
-    ram  : ORIGIN = 0xA0000000, LENGTH = 0x2000000
+    ram  : ORIGIN = 0xA0000000, LENGTH = 0x20000000
 }
 
 SECTIONS
@@ -24,6 +24,5 @@ SECTIONS
     SECTION_data (ram, ALIGN (0x4), LMA_EQ_VMA)
     SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
-//    CYG_LABEL_DEFN(__pci_window) = 0xf00000; . = CYG_LABEL_DEFN(__pci_window) + 0x100000;
     SECTIONS_END
 }
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.mlt
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_ram.mlt
@@ -1,5 +1,5 @@
 version 0
-region ram 0 1000000 0 !
+region ram 0 20000000 0 !
 section fixed_vectors 0 1 0 1 1 0 1 0 20 20 !
 section rom_vectors 0 1 0 1 1 1 1 1 20000 20000 text text !
 section text 0 4 0 1 0 1 0 1 fini fini !
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.h
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.h
@@ -8,7 +8,7 @@
 
 #endif
 #define CYGMEM_REGION_ram (0xA0000000)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #define CYGMEM_REGION_rom (0x00000000)
 #define CYGMEM_REGION_rom_SIZE (0x800000)
@@ -17,9 +17,4 @@
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0xa2000000 - (size_t) CYG_LABEL_NAME (__heap1))
-#ifndef __ASSEMBLER__
-extern char CYG_LABEL_NAME (__pci_window) [];
-#endif
-// #define CYGMEM_SECTION_pci_window (CYG_LABEL_NAME (__pci_window))
-// #define CYGMEM_SECTION_pci_window_SIZE (0x100000)
+#define CYGMEM_SECTION_heap1_SIZE (0xc0000000 - (size_t) CYG_LABEL_NAME (__heap1))
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.ldi
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.ldi
@@ -6,7 +6,7 @@
 
 MEMORY
 {
-    ram  : ORIGIN = 0xA0000000, LENGTH = 0x2000000
+    ram  : ORIGIN = 0xA0000000, LENGTH = 0x20000000
     rom  : ORIGIN = 0x00000000, LENGTH = 0x800000
 }
 
@@ -24,6 +24,5 @@ SECTIONS
     SECTION_data (ram, 0xA000A000, FOLLOWING (.gcc_except_table))
     SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
-//    CYG_LABEL_DEFN(__pci_window) = 0xf00000; . = CYG_LABEL_DEFN(__pci_window) + 0x100000;
     SECTIONS_END
 }
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.mlt
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_rom.mlt
@@ -1,5 +1,5 @@
 version 0
-region ram a0000000 2000000 0 !
+region ram a0000000 20000000 0 !
 region rom 00000000 800000 1 !
 section fixed_vectors 0 1 0 1 1 0 1 0 20 20 !
 section data 0 1 1 1 1 1 0 0 8000 bss !
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.h
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.h
@@ -14,10 +14,10 @@
 #define CYGMEM_REGION_rom_SIZE (0x7c0000)
 #define CYGMEM_REGION_rom_ATTR (CYGMEM_REGION_ATTR_R)
 #define CYGMEM_REGION_ram (0xa0000000)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #ifndef __ASSEMBLER__
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0xa2000000 - (size_t) CYG_LABEL_NAME (__heap1))
+#define CYGMEM_SECTION_heap1_SIZE (0xc0000000 - (size_t) CYG_LABEL_NAME (__heap1))
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.ldi
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.ldi
@@ -8,7 +8,7 @@ MEMORY
 {
     vecs : ORIGIN = 0, LENGTH = 0x1000
     rom : ORIGIN = 0x40000, LENGTH = 0x7c0000
-    ram : ORIGIN = 0xa0000000, LENGTH = 0x2000000
+    ram : ORIGIN = 0xa0000000, LENGTH = 0x20000000
 }
 
 SECTIONS
--- a/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.mlt
+++ b/packages/hal/arm/xscale/iq80310/current/include/pkgconf/mlt_arm_xscale_iq80310_roma.mlt
@@ -1,7 +1,7 @@
 version 0
 region vecs 0 1000 1 !
 region rom 40000 7c0000 1 !
-region ram a0000000 2000000 0 !
+region ram a0000000 20000000 0 !
 section fixed_vectors 0 1 0 1 1 0 1 0 20 20 !
 section rom_vectors 0 1 0 1 1 1 1 1 40000 40000 text text !
 section text 0 4 0 1 0 1 0 1 fini fini !
--- a/packages/hal/arm/xscale/iq80321/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80321/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-30  Mark Salter  <msalter@redhat.com>
+
+	* include/pkgconf/mlt_*: Adjust RAM size to match max supported.
+	Actual size of installed RAM determined at runtime.
+	
 2003-01-22  Mark Salter  <msalter@redhat.com>
 
 	* src/diag/diag.c: Don't define DEFINE_VARS.
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.h
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.h
@@ -8,11 +8,11 @@
 
 #endif
 #define CYGMEM_REGION_ram (0)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #ifndef __ASSEMBLER__
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0x1e00000 - (size_t) CYG_LABEL_NAME (__heap1))
+#define CYGMEM_SECTION_heap1_SIZE (0x1fe00000 - (size_t) CYG_LABEL_NAME (__heap1))
 
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.ldi
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.ldi
@@ -6,7 +6,7 @@
 
 MEMORY
 {
-    ram : ORIGIN = 0, LENGTH = 0x2000000
+    ram : ORIGIN = 0, LENGTH = 0x20000000
 }
 
 SECTIONS
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.mlt
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram.mlt
@@ -1,5 +1,5 @@
 version 0
-region ram 0 2000000 0 !
+region ram 0 20000000 0 !
 section fixed_vectors 0 1 0 1 1 0 1 0 20 20 !
 section rom_vectors 0 1 0 1 1 1 1 1 20000 20000 text text !
 section text 0 4 0 1 0 1 0 1 fini fini !
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.h
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.h
@@ -8,12 +8,12 @@
 
 #endif
 #define CYGMEM_REGION_ram (0xA0000000)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #ifndef __ASSEMBLER__
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0xa1e00000 - (size_t) CYG_LABEL_NAME (__heap1))
+#define CYGMEM_SECTION_heap1_SIZE (0xbfe00000 - (size_t) CYG_LABEL_NAME (__heap1))
 
 
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.ldi
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_ram_altmap.ldi
@@ -7,7 +7,7 @@
 MEMORY
 {
     ramalias : ORIGIN = 0x0, LENGTH = 0x100000
-    ram : ORIGIN = 0xA0000000, LENGTH = 0x2000000
+    ram : ORIGIN = 0xA0000000, LENGTH = 0x20000000
 }
 
 SECTIONS
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.h
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.h
@@ -8,7 +8,7 @@
 
 #endif
 #define CYGMEM_REGION_ram (0)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #define CYGMEM_REGION_rom (0xf0000000)
 #define CYGMEM_REGION_rom_SIZE (0x40000)
@@ -17,4 +17,4 @@
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0x2000000 - (size_t) CYG_LABEL_NAME (__heap1))
+#define CYGMEM_SECTION_heap1_SIZE (0x20000000 - (size_t) CYG_LABEL_NAME (__heap1))
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.ldi
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.ldi
@@ -6,7 +6,7 @@
 
 MEMORY
 {
-    ram : ORIGIN = 0, LENGTH = 0x2000000
+    ram : ORIGIN = 0, LENGTH = 0x20000000
     rom : ORIGIN = 0xf0000000, LENGTH = 0x40000
 }
 
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.mlt
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom.mlt
@@ -1,5 +1,5 @@
 version 0
-region ram 0 2000000 0 !
+region ram 0 20000000 0 !
 region rom f0000000 40000 1 !
 section fixed_vectors 0 1 0 1 1 0 1 0 20 20 !
 section data 0 1 1 1 1 1 0 0 8000 bss !
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.h
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.h
@@ -8,7 +8,7 @@
 
 #endif
 #define CYGMEM_REGION_ram (0xA0000000)
-#define CYGMEM_REGION_ram_SIZE (0x2000000)
+#define CYGMEM_REGION_ram_SIZE (0x20000000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 #define CYGMEM_REGION_rom (0xF0000000)
 #define CYGMEM_REGION_rom_SIZE (0x40000)
@@ -17,4 +17,4 @@
 extern char CYG_LABEL_NAME (__heap1) [];
 #endif
 #define CYGMEM_SECTION_heap1 (CYG_LABEL_NAME (__heap1))
-#define CYGMEM_SECTION_heap1_SIZE (0xa1e00000 - (size_t) CYG_LABEL_NAME (__heap1))
+#define CYGMEM_SECTION_heap1_SIZE (0xbfe00000 - (size_t) CYG_LABEL_NAME (__heap1))
--- a/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.ldi
+++ b/packages/hal/arm/xscale/iq80321/current/include/pkgconf/mlt_arm_xscale_iq80321_rom_altmap.ldi
@@ -8,7 +8,7 @@
 MEMORY
 {
     ramalias : ORIGIN = 0x0, LENGTH = 0x100000
-    ram : ORIGIN = 0xA0000000, LENGTH = 0x2000000
+    ram : ORIGIN = 0xA0000000, LENGTH = 0x20000000
     rom : ORIGIN = 0xF0000000, LENGTH = 0x40000
 }