Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / m68knommu / kernel / vmlinux.lds.S

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 87f3bc4..a331cc9 100644 (file)
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -1,7 +1,7 @@
 /*
  *     vmlinux.lds.S -- master linker script for m68knommu arch
  *
- *     (C) Copyright 2002-2003, Greg Ungerer <gerg@snapgear.com>
+ *     (C) Copyright 2002-2004, Greg Ungerer <gerg@snapgear.com>
  *
  *     This ends up looking compilcated, because of the number of
  *     address variations for ram and rom/flash layouts. The real
@@ -107,7 +107,7 @@
  */
 #if defined(CONFIG_ELITE)
 #define        RAM_START       0x30020000
-#define        RAM_END         0xe0000
+#define        RAM_LENGTH      0xe0000
 #endif
 
 /*
@@ -117,35 +117,53 @@
  */
 #if defined(CONFIG_M5206eC3) || defined(CONFIG_M5249C3) || \
     defined(CONFIG_M5272C3) || defined(CONFIG_M5307C3) || \
-    defined(CONFIG_ARN5307) || defined(CONFIG_M5407C3)
+    defined(CONFIG_ARN5307) || defined(CONFIG_M5407C3) || \
+    defined(CONFIG_M5271EVB) || defined(CONFIG_M5275EVB) || \
+    defined(CONFIG_M5235EVB)
 #define        RAM_START       0x20000
 #define        RAM_LENGTH      0x3e0000
 #endif
 
 /*
- *   The senTec COBRA5272 board has nearly the same
- *   memory layout as the M5272C3.
- *   We assume 16MB ram.
+ *     The Freescale 5208EVB board has 32MB of RAM.
+ */
+#if defined(CONFIG_M5208EVB)
+#define        RAM_START       0x40020000
+#define        RAM_LENGTH      0x01fe0000
+#endif
+
+/*
+ *     The senTec COBRA5272 board has nearly the same memory layout as 
+ *     the M5272C3. We assume 16MiB ram.
  */
 #if defined(CONFIG_COBRA5272)
 #define RAM_START   0x20000
 #define RAM_LENGTH  0xfe0000
 #endif
 
-#if defined(CONFIG_M5282C3)
+#if defined(CONFIG_M5282EVB)
 #define        RAM_START       0x10000
 #define        RAM_LENGTH      0x3f0000
 #endif
 
 /*
- *   The senTec COBRA5282 board has the same
- *   memory layout as the M5282C3.
+ *     The senTec COBRA5282 board has the same memory layout as the M5282EVB.
  */
 #if defined(CONFIG_COBRA5282)
 #define  RAM_START   0x10000
 #define  RAM_LENGTH  0x3f0000
 #endif
 
+
+/*
+ *     The EMAC SoM-5282EM module.
+ */
+#if defined(CONFIG_SOM5282EM)
+#define  RAM_START   0x10000
+#define  RAM_LENGTH  0xff0000
+#endif
+
+
 /*
  *     These flash boot boards use all of ram for operation. Again the
  *     actual memory size is not important here, assume at least 4MiB.
@@ -153,11 +171,28 @@
  */
 #if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
     defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-    defined(CONFIG_CLEOPATRA)
+    defined(CONFIG_HW_FEITH)
 #define        RAM_START       0x400
 #define        RAM_LENGTH      0x3ffc00
 #endif
 
+/*
+ *     Sneha Boards mimimun memory
+ *     The end of RAM will vary depending on how much ram is fitted,
+ *     but this isn't important here, we assume at least 4MiB.
+ */
+#if defined(CONFIG_CPU16B)   
+#define        RAM_START       0x20000
+#define        RAM_LENGTH      0x3e0000
+#endif
+
+#if defined(CONFIG_MOD5272)
+#define RAM_START      0x02000000
+#define RAM_LENGTH     0x00800000
+#define RAMVEC_START   0x20000000
+#define RAMVEC_LENGTH  0x00000400
+#endif
+
 #if defined(CONFIG_RAMKERNEL)
 #define        TEXT            ram
 #define        DATA            ram
@@ -234,6 +269,11 @@ SECTIONS {
                *(__ksymtab_gpl)
                __stop___ksymtab_gpl = .;
 
+               /* Kernel symbol table: GPL-future symbols */
+               __start___ksymtab_gpl_future = .;
+               *(__ksymtab_gpl_future)
+               __stop___ksymtab_gpl_future = .;
+
                /* Kernel symbol table: Normal symbols */
                __start___kcrctab = .;
                *(__kcrctab)
@@ -244,9 +284,20 @@ SECTIONS {
                *(__kcrctab_gpl)
                __stop___kcrctab_gpl = .;
 
+               /* Kernel symbol table: GPL-future symbols */
+               __start___kcrctab_gpl_future = .;
+               *(__kcrctab_gpl_future)
+               __stop___kcrctab_gpl_future = .;
+
                /* Kernel symbol table: strings */
                *(__ksymtab_strings)
 
+               /* Built-in module parameters */
+               . = ALIGN(4) ;
+               __start___param = .;
+               *(__param)
+               __stop___param = .;
+
                . = ALIGN(4) ;
                _etext = . ;
        } > TEXT
@@ -303,7 +354,7 @@ SECTIONS {
                __initramfs_start = .;
                *(.init.ramfs)
                __initramfs_end = .;
-               . = ALIGN(4);
+               . = ALIGN(4096);
                __init_end = .;
        } > INIT