Finish up support for the ATSTK1000/ATSTK1002 boards

Add atstk1002_config target to Makefile and move the AVR32 section
down below Blackfin so that it doesn't end up in the middle of
MIPS.

Drop the autogenerated linker script thing for now. Will have to
revisit how to handle chips with different flash and RAM layout
later.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

diff --git a/Makefile b/Makefile
index dec6355217247f1dacade5425dcf26fac284805a..c2e47d4034af7a1182659e879ae872cf7f22ebbf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2122,13 +2122,6 @@ pb1000_config            :       unconfig
        @echo "#define CONFIG_PB1000 1" >>$(obj)include/config.h
        @$(MKCONFIG) -a pb1x00 mips mips pb1x00
 
-#========================================================================
-# AVR32
-#========================================================================
-#########################################################################
-## AT32AP7xxx
-#########################################################################
-
 #########################################################################
 ## MIPS64 5Kc
 #########################################################################
@@ -2248,6 +2241,16 @@ stamp_config     :       unconfig
 dspstamp_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) blackfin bf533 dsp_stamp
 
+#========================================================================
+# AVR32
+#========================================================================
+#########################################################################
+## AT32AP7xxx
+#########################################################################
+
+atstk1002_config       :       unconfig
+       @./mkconfig $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+
 #########################################################################
 #########################################################################
 #########################################################################

diff --git a/board/atmel/atstk1000/u-boot.lds b/board/atmel/atstk1000/u-boot.lds
new file mode 100644 (file)
index 0000000..ef89ea4
--- /dev/null
+++ b/board/atmel/atstk1000/u-boot.lds
@@ -0,0 +1,77 @@
+/* -*- 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 : {
+               *(.text)
+               *(.text.*)
+       }
+
+       . = ALIGN(32);
+       __flashprog_start = .;
+       .flashprog : {
+               *(.flashprog)
+       }
+       . = ALIGN(32);
+       __flashprog_end = .;
+
+       . = ALIGN(8);
+       .rodata : {
+               *(.rodata)
+               *(.rodata.*)
+       }
+       _etext = .;
+
+       __data_lma = ALIGN(8);
+       . = 0x24000000;
+       _data = .;
+       .data : AT(__data_lma) {
+               *(.data)
+               *(.data.*)
+       }
+
+       . = ALIGN(4);
+       __u_boot_cmd_start = .;
+       __u_boot_cmd_lma = __data_lma + (__u_boot_cmd_start - _data);
+       .u_boot_cmd : AT(__u_boot_cmd_lma) {
+               KEEP(*(.u_boot_cmd))
+       }
+       __u_boot_cmd_end = .;
+
+       . = ALIGN(8);
+       _edata = .;
+       __edata_lma = __u_boot_cmd_lma + (_edata - __u_boot_cmd_start);
+
+       .bss : AT(__edata_lma) {
+               *(.bss)
+               *(.bss.*)
+       }
+       . = ALIGN(8);
+       _end = .;
+}

diff --git a/board/atmel/atstk1000/u-boot.lds.S b/board/atmel/atstk1000/u-boot.lds.S
deleted file mode 100644 (file)
index d46b82c..0000000
--- a/board/atmel/atstk1000/u-boot.lds.S
+++ /dev/null
@@ -1,79 +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
- */
-#include <config.h>
-
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-SECTIONS
-{
-       . = CFG_FLASH_BASE;
-       _text = .;
-       .text : {
-               *(.text)
-               *(.text.*)
-       }
-
-       . = ALIGN(CFG_ICACHE_LINESZ);
-       __flashprog_start = .;
-       .flashprog : {
-               *(.flashprog)
-       }
-       . = ALIGN(CFG_ICACHE_LINESZ);
-       __flashprog_end = .;
-
-       . = ALIGN(8);
-       .rodata : {
-               *(.rodata)
-               *(.rodata.*)
-       }
-       _etext = .;
-
-       __data_lma = ALIGN(8);
-       . = CFG_INTRAM_BASE;
-       _data = .;
-       .data : AT(__data_lma) {
-               *(.data)
-               *(.data.*)
-       }
-
-       . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       __u_boot_cmd_lma = __data_lma + (__u_boot_cmd_start - _data);
-       .u_boot_cmd : AT(__u_boot_cmd_lma) {
-               KEEP(*(.u_boot_cmd))
-       }
-       __u_boot_cmd_end = .;
-
-       . = ALIGN(8);
-       _edata = .;
-       __edata_lma = __u_boot_cmd_lma + (_edata - __u_boot_cmd_start);
-
-       .bss : AT(__edata_lma) {
-               *(.bss)
-               *(.bss.*)
-       }
-       . = ALIGN(8);
-       _end = .;
-}