* scripttempl/avr.sc (MEMORY): Use DATA_ORIGIN.

        * emulparams/avr1.sh (DATA_ORIGIN): Add.
        * emulparams/avr2.sh (DATA_ORIGIN): Add.
        * emulparams/avr25.sh (DATA_ORIGIN): Add.
        * emulparams/avr3.sh (DATA_ORIGIN): Add.
        * emulparams/avr31.sh (DATA_ORIGIN): Add.
        * emulparams/avr35.sh (DATA_ORIGIN): Add.
        * emulparams/avr4.sh (DATA_ORIGIN): Add.
        * emulparams/avr5.sh (DATA_ORIGIN): Add.
        * emulparams/avr51.sh (DATA_ORIGIN): Add.
        (DATA_LENGTH): Update.
        * emulparams/avr6.sh (DATA_ORIGIN): Add.
        (DATA_LENGTH): Update.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 83461c8..a13b985 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,19 @@
+2009-05-05  Anatoly Sokolov  <aesok@post.ru>
+
+       * scripttempl/avr.sc (MEMORY): Use DATA_ORIGIN.
+       * emulparams/avr1.sh (DATA_ORIGIN): Add.
+       * emulparams/avr2.sh (DATA_ORIGIN): Add.
+       * emulparams/avr25.sh (DATA_ORIGIN): Add.
+       * emulparams/avr3.sh (DATA_ORIGIN): Add.
+       * emulparams/avr31.sh (DATA_ORIGIN): Add.
+       * emulparams/avr35.sh (DATA_ORIGIN): Add.
+       * emulparams/avr4.sh (DATA_ORIGIN): Add.
+       * emulparams/avr5.sh (DATA_ORIGIN): Add.
+       * emulparams/avr51.sh (DATA_ORIGIN): Add.
+       (DATA_LENGTH): Update.
+       * emulparams/avr6.sh (DATA_ORIGIN): Add.
+       (DATA_LENGTH): Update.
+
 2009-05-04  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * NEWS:  Mention new feature.

diff --git a/ld/emulparams/avr1.sh b/ld/emulparams/avr1.sh
index 7d907fe..2f6af99 100644 (file)
--- a/ld/emulparams/avr1.sh
+++ b/ld/emulparams/avr1.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr2.sh b/ld/emulparams/avr2.sh
index 2bd677b..cb35bb9 100644 (file)
--- a/ld/emulparams/avr2.sh
+++ b/ld/emulparams/avr2.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr25.sh b/ld/emulparams/avr25.sh
index 12a0023..2965347 100644 (file)
--- a/ld/emulparams/avr25.sh
+++ b/ld/emulparams/avr25.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr3.sh b/ld/emulparams/avr3.sh
index ff559e6..a0b86c4 100644 (file)
--- a/ld/emulparams/avr3.sh
+++ b/ld/emulparams/avr3.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr31.sh b/ld/emulparams/avr31.sh
index e548181..6e1ee0a 100644 (file)
--- a/ld/emulparams/avr31.sh
+++ b/ld/emulparams/avr31.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr35.sh b/ld/emulparams/avr35.sh
index 6186186..abc6790 100644 (file)
--- a/ld/emulparams/avr35.sh
+++ b/ld/emulparams/avr35.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=64K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr4.sh b/ld/emulparams/avr4.sh
index 2f57cb0..deaf3e7 100644 (file)
--- a/ld/emulparams/avr4.sh
+++ b/ld/emulparams/avr4.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr5.sh b/ld/emulparams/avr5.sh
index 69090be..2d0fc4f 100644 (file)
--- a/ld/emulparams/avr5.sh
+++ b/ld/emulparams/avr5.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr51.sh b/ld/emulparams/avr51.sh
index be8e8f5..2069dfe 100644 (file)
--- a/ld/emulparams/avr51.sh
+++ b/ld/emulparams/avr51.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
-DATA_LENGTH=0xffa0
+DATA_ORIGIN=0x800100
+DATA_LENGTH=0xff00
 EXTRA_EM_FILE=avrelf

diff --git a/ld/emulparams/avr6.sh b/ld/emulparams/avr6.sh
index 5326488..c1a4fab 100644 (file)
--- a/ld/emulparams/avr6.sh
+++ b/ld/emulparams/avr6.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=1024K
-DATA_LENGTH=0xffa0
+DATA_ORIGIN=0x800200
+DATA_LENGTH=0xfe00
 EXTRA_EM_FILE=avrelf

diff --git a/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc
index 23b3046..4545b72 100644 (file)
--- a/ld/scripttempl/avr.sc
+++ b/ld/scripttempl/avr.sc
@@ -5,7 +5,7 @@ OUTPUT_ARCH(${ARCH})
 MEMORY
 {
   text   (rx)   : ORIGIN = 0, LENGTH = $TEXT_LENGTH
-  data   (rw!x) : ORIGIN = 0x800060, LENGTH = $DATA_LENGTH
+  data   (rw!x) : ORIGIN = $DATA_ORIGIN, LENGTH = $DATA_LENGTH
   eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
 }