This commit was manufactured by cvs2svn to create tag

[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 8ba00a2..87f3bc4 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-2004, Greg Ungerer <gerg@snapgear.com>
+ *     (C) Copyright 2002-2003, 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
@@ -117,8 +117,7 @@
  */
 #if defined(CONFIG_M5206eC3) || defined(CONFIG_M5249C3) || \
     defined(CONFIG_M5272C3) || defined(CONFIG_M5307C3) || \
-    defined(CONFIG_ARN5307) || defined(CONFIG_M5407C3) || \
-    defined(CONFIG_M5271EVB) || defined(CONFIG_M5275EVB)
+    defined(CONFIG_ARN5307) || defined(CONFIG_M5407C3)
 #define        RAM_START       0x20000
 #define        RAM_LENGTH      0x3e0000
 #endif
@@ -133,14 +132,14 @@
 #define RAM_LENGTH  0xfe0000
 #endif
 
-#if defined(CONFIG_M5282EVB)
+#if defined(CONFIG_M5282C3)
 #define        RAM_START       0x10000
 #define        RAM_LENGTH      0x3f0000
 #endif
 
 /*
  *   The senTec COBRA5282 board has the same
- *   memory layout as the M5282EVB.
+ *   memory layout as the M5282C3.
  */
 #if defined(CONFIG_COBRA5282)
 #define  RAM_START   0x10000
@@ -154,22 +153,11 @@
  */
 #if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
     defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-    defined(CONFIG_HW_FEITH)
+    defined(CONFIG_CLEOPATRA)
 #define        RAM_START       0x400
 #define        RAM_LENGTH      0x3ffc00
 #endif
 
-/*
- *     Sneha Boards mimimun memmory
- *     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_RAMKERNEL)
 #define        TEXT            ram
 #define        DATA            ram
@@ -259,11 +247,6 @@ SECTIONS {
                /* Kernel symbol table: strings */
                *(__ksymtab_strings)
 
-               /* Built-in module parameters */
-               __start___param = .;
-               *(__param)
-               __stop___param = .;
-
                . = ALIGN(4) ;
                _etext = . ;
        } > TEXT
@@ -320,7 +303,7 @@ SECTIONS {
                __initramfs_start = .;
                *(.init.ramfs)
                __initramfs_end = .;
-               . = ALIGN(4096);
+               . = ALIGN(4);
                __init_end = .;
        } > INIT