avr32: use single linker script

This patch move the atstk100x linker script to $(CPUDIR) and delete other
pure copies of this file in each board directory.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index a751a3d7874318917d83c1473ca5a6a8693f9909..d8e7ebb0be3f0c72c8dbe7e627262fecf5274c01 100644 (file)
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -29,3 +29,5 @@ PLATFORM_RELFLAGS     += -ffixed-r5 -fPIC -mno-init-got -mrelax
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 
 LDFLAGS_u-boot         = --gc-sections --relax
+
+LDSCRIPT                       = $(SRCTREE)/$(CPUDIR)/u-boot.lds

diff --git a/arch/avr32/cpu/u-boot.lds b/arch/avr32/cpu/u-boot.lds
new file mode 100644 (file)
index 0000000..0e532f2
--- /dev/null
+++ b/arch/avr32/cpu/u-boot.lds
@@ -0,0 +1,72 @@
+/* -*- Fundamental -*-
+ *
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
+OUTPUT_ARCH(avr32)
+ENTRY(_start)
+
+SECTIONS
+{
+       . = 0;
+       _text = .;
+       .text : {
+               *(.exception.text)
+               *(.text)
+               *(.text.*)
+       }
+       _etext = .;
+
+       .rodata : {
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+       }
+
+       . = ALIGN(8);
+       _data = .;
+       .data : {
+               *(.data)
+               *(.data.*)
+       }
+
+       . = ALIGN(4);
+       __u_boot_cmd_start = .;
+       .u_boot_cmd : {
+               KEEP(*(.u_boot_cmd))
+       }
+       __u_boot_cmd_end = .;
+
+       . = ALIGN(4);
+       _got = .;
+       .got : {
+               *(.got)
+       }
+       _egot = .;
+
+       . = ALIGN(8);
+       _edata = .;
+
+       .bss (NOLOAD) : {
+               *(.bss)
+               *(.bss.*)
+       }
+       . = ALIGN(8);
+       __bss_end__ = .;
+}

diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds
deleted file mode 100644 (file)
index 0a1a8e1..0000000
--- a/board/atmel/atngw100/u-boot.lds
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = 0;
-       _text = .;
-       .text : {
-               *(.exception.text)
-               *(.text)
-               *(.text.*)
-       }
-       _etext = .;
-
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-
-       . = ALIGN(8);
-       _data = .;
-       .data : {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(4);
-       _got = .;
-       .got : {
-               *(.got)
-       }
-       _egot = .;
-
-       . = ALIGN(8);
-       _edata = .;
-
-       .bss : {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       __bss_end__ = .;
-}

diff --git a/board/atmel/atstk1000/u-boot.lds b/board/atmel/atstk1000/u-boot.lds
deleted file mode 100644 (file)
index 0e532f2..0000000
--- a/board/atmel/atstk1000/u-boot.lds
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = 0;
-       _text = .;
-       .text : {
-               *(.exception.text)
-               *(.text)
-               *(.text.*)
-       }
-       _etext = .;
-
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-
-       . = ALIGN(8);
-       _data = .;
-       .data : {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(4);
-       _got = .;
-       .got : {
-               *(.got)
-       }
-       _egot = .;
-
-       . = ALIGN(8);
-       _edata = .;
-
-       .bss (NOLOAD) : {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       __bss_end__ = .;
-}

diff --git a/board/earthlcd/favr-32-ezkit/u-boot.lds b/board/earthlcd/favr-32-ezkit/u-boot.lds
deleted file mode 100644 (file)
index 20e3631..0000000
--- a/board/earthlcd/favr-32-ezkit/u-boot.lds
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2008 Atmel Corporation
- *
- * See file CREDITS for list of people who contributed to this project.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = 0;
-       _text = .;
-       .text : {
-               *(.exception.text)
-               *(.text)
-               *(.text.*)
-       }
-       _etext = .;
-
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-
-       . = ALIGN(8);
-       _data = .;
-       .data : {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(4);
-       _got = .;
-       .got : {
-               *(.got)
-       }
-       _egot = .;
-
-       . = ALIGN(8);
-       _edata = .;
-
-       .bss (NOLOAD) : {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       __bss_end__ = .;
-}

diff --git a/board/mimc/mimc200/u-boot.lds b/board/mimc/mimc200/u-boot.lds
deleted file mode 100644 (file)
index 0a1a8e1..0000000
--- a/board/mimc/mimc200/u-boot.lds
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = 0;
-       _text = .;
-       .text : {
-               *(.exception.text)
-               *(.text)
-               *(.text.*)
-       }
-       _etext = .;
-
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-
-       . = ALIGN(8);
-       _data = .;
-       .data : {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(4);
-       _got = .;
-       .got : {
-               *(.got)
-       }
-       _egot = .;
-
-       . = ALIGN(8);
-       _edata = .;
-
-       .bss : {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       __bss_end__ = .;
-}

diff --git a/board/miromico/hammerhead/u-boot.lds b/board/miromico/hammerhead/u-boot.lds
deleted file mode 100644 (file)
index 0a1a8e1..0000000
--- a/board/miromico/hammerhead/u-boot.lds
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Fundamental -*-
- *
- * Copyright (C) 2005-2006 Atmel Corporation
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = 0;
-       _text = .;
-       .text : {
-               *(.exception.text)
-               *(.text)
-               *(.text.*)
-       }
-       _etext = .;
-
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-
-       . = ALIGN(8);
-       _data = .;
-       .data : {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(4);
-       _got = .;
-       .got : {
-               *(.got)
-       }
-       _egot = .;
-
-       . = ALIGN(8);
-       _edata = .;
-
-       .bss : {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       __bss_end__ = .;
-}