Patchwork [U-Boot,v2,4/5] coldfire: Remove link files entries to prevent multiple definitions

login
register
mail settings
Submitter y@theia.denx.de
Date Aug. 31, 2011, 12:11 p.m.
Message ID <1314792699-9136-1-git-send-email-y>
Download mbox | patch
Permalink /patch/112544/
State Changes Requested
Delegated to: Jason Jin
Headers show

Comments

y@theia.denx.de - Aug. 31, 2011, 12:11 p.m.
From: Stany MARCEL <stany.marcel@novasys-ingenierie.com>

Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
Changes for v2:
   - Missing Corrections of link files for m54451evb board

 board/BuS/EB+MCF-EV123/u-boot.lds    |    5 -----
 board/astro/mcf5373l/u-boot.lds      |    4 ----
 board/cobra5272/u-boot.lds           |    5 -----
 board/esd/tasreg/u-boot.lds          |    4 ----
 board/freescale/m5208evbe/u-boot.lds |    1 -
 board/freescale/m5235evb/u-boot.16   |    5 -----
 board/freescale/m5235evb/u-boot.32   |   13 -------------
 board/freescale/m5249evb/u-boot.lds  |    4 ----
 board/freescale/m5253demo/u-boot.lds |    4 ----
 board/freescale/m5253evbe/u-boot.lds |    4 ----
 board/freescale/m5271evb/u-boot.lds  |    4 ----
 board/freescale/m5272c3/u-boot.lds   |    4 ----
 board/freescale/m5275evb/u-boot.lds  |    3 ---
 board/freescale/m5282evb/u-boot.lds  |    4 ----
 board/freescale/m53017evb/u-boot.lds |    2 --
 board/freescale/m5329evb/u-boot.lds  |    4 ----
 board/freescale/m5373evb/u-boot.lds  |    4 ----
 board/freescale/m54451evb/u-boot.spa |    9 +--------
 board/freescale/m54451evb/u-boot.stm |   12 +-----------
 board/freescale/m54455evb/u-boot.atm |    4 ----
 board/freescale/m547xevb/u-boot.lds  |    3 ---
 board/freescale/m548xevb/u-boot.lds  |    3 ---
 board/idmr/u-boot.lds                |    4 ----
 23 files changed, 2 insertions(+), 107 deletions(-)

--
1.7.1

Patch

diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index e0359e3..08983c9 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -56,11 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o	(.text)
-    common/dlmalloc.o	(.text)
-    lib/string.o	(.text)
-    lib/vsprintf.o	(.text)
-    lib/crc32.o	(.text)
-    lib/zlib.o	(.text)

 /*    . = env_offset; */
     common/env_embedded.o(.text)
diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
index a1d8e0f..e628c36 100644
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf532x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index da14807..a641452 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -55,11 +55,6 @@  SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/cpu/mcf52x2/cpu_init.o	(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index 27a6b93..451d721 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds
index e5011a6..a7b1eb3 100644
--- a/board/freescale/m5208evbe/u-boot.lds
+++ b/board/freescale/m5208evbe/u-boot.lds
@@ -58,7 +58,6 @@  SECTIONS
     arch/m68k/cpu/mcf52x2/start.o		(.text)
     arch/m68k/cpu/mcf52x2/libmcf52x2.o	(.text)
     arch/m68k/lib/libm68k.o		(.text)
-    common/dlmalloc.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16
index 657cd9d..1df2b07 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -56,11 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf523x/start.o		(.text)
-    arch/m68k/cpu/mcf523x/cpu_init.o	(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index 1f91994..1df2b07 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -56,19 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf523x/start.o		(.text)
-    arch/m68k/cpu/mcf523x/cpu.o		(.text)
-    arch/m68k/cpu/mcf523x/cpu_init.o	(.text)
-    arch/m68k/cpu/mcf523x/interrupts.o	(.text)
-    arch/m68k/cpu/mcf523x/speed.o		(.text)
-    arch/m68k/lib/libm68k.o		(.text)
-    common/dlmalloc.o		(.text)
-    common/cmd_bootm.o		(.text)
-    common/cmd_flash.o		(.text)
-    common/cmd_elf.o		(.text)
-    common/cmd_mem.o		(.text)
-    common/console.o		(.text)
-    common/main.o		(.text)
-    lib/libgeneric.o	(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index 27a6b93..451d721 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index 3644838..279c5b9 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 34aa73d..85dfdc2 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index e16a266..ac95a55 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -57,10 +57,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index ff5bfe6..9c26c43 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index 8e792fe..d6088dd 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -56,9 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    common/dlmalloc.o		(.text)
-    lib/string.o	(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds
index 7e6aa6a..d16d882 100644
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o	(.text)
-    common/dlmalloc.o	(.text)
-    lib/string.o	(.text)
-    lib/vsprintf.o	(.text)
-    lib/crc32.o	(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index 445566b..69b57c5 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -58,8 +58,6 @@  SECTIONS
     arch/m68k/cpu/mcf532x/start.o		(.text)
     arch/m68k/cpu/mcf532x/libmcf532x.o	(.text)
     arch/m68k/lib/libm68k.o		(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index 4375342..f267609 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf532x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index f3acfc7..ee2e5a3 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf532x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index e1bacd3..c4d12d1 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -2,7 +2,7 @@ 
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
+ * See file CREDITS foxr list of people who contributed to this
  * project.
  *
  * This program is free software; you can redistribute it and/or
@@ -56,13 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf5445x/start.o		(.text)
-    arch/m68k/cpu/mcf5445x/libmcf5445x.o	(.text)
-    arch/m68k/lib/libm68k.o		(.text)
-    common/cmd_flash.o		(.text)
-    common/dlmalloc.o		(.text)
-    common/main.o		(.text)
-    common/image.o		(.text)
-    lib/libgeneric.o	(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index 1c6979f..a0eb0ad 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -56,20 +56,10 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf5445x/start.o		(.text)
-/*    arch/m68k/cpu/mcf5445x/cpu_init.o		(.text)
-    arch/m68k/cpu/mcf5445x/cpu.o			(.text)
-    arch/m68k/cpu/mcf5445x/dspi.o			(.text)
-    arch/m68k/cpu/mcf5445x/interrupt.o		(.text)
-    arch/m68k/cpu/mcf5445x/speed.o		(.text)
-    arch/m68k/lib/board.o			(.text)
-    common/serial.o			(.text)
-    common/console.o			(.text)
-    lib/display_options.o	(.text)
-    board/freescale/m54455evb/m54455evb.o	(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
-*/
+
     *(.text)
     *(.fixup)
     *(.got1)
diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index cf4650e..3487918 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -56,10 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf5445x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds
index a4e4d5a..728a5d3 100644
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -56,9 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf547x_8x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds
index a4e4d5a..728a5d3 100644
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -56,9 +56,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf547x_8x/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/lib/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index e16a266..ac95a55 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -57,10 +57,6 @@  SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/

     arch/m68k/cpu/mcf52x2/start.o		(.text)
-    arch/m68k/lib/traps.o		(.text)
-    arch/m68k/cpu/mcf52x2/interrupts.o	(.text)
-    common/dlmalloc.o		(.text)
-    lib/zlib.o		(.text)

     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)