* 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 83461c8e6a25230b1c476e10da16c7c54c4186b8..a13b98534ba6e0a375208884c6a74cc4dbeaf5ab 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 7d907fe008d6b472f1b032709824d6c839dfc478..2f6af99a7a05c306897b88ba8dd2e061d84ab599 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 2bd677bfc8c6d763265cf1b56baba027591bd88e..cb35bb95b9e052cca8b753eb513c870c15893a06 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 12a002389bc476252bbac9a1705f04a7102b460a..2965347efc72b53dfedb17dd81527dbcc4a6c799 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 ff559e6d29a28e62cfd0f003f40af253897bcf3d..a0b86c4ec4b1db362a2e61dfb2d31382ed243923 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 e54818166818c5c075cfb64f9fbfb6fd1f8639c0..6e1ee0a8fb91dc5a72cff9ad8caee800458ce59d 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 6186186442ba4a13bdf59e5a563cf3eb125eec24..abc6790b079859ff6fdb582bce6fabad33f780fd 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 2f57cb0eb76e0c3b2364a163b888c447eda2fba6..deaf3e738d50b95f4cfc6aa84d316a2eba62d999 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 69090beedefa6f3ff147c6ebaab9fd416c1d9cf5..2d0fc4fab87edb2309f31edc2e803eb316005a9a 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 be8e8f5febb6bd7d6047c6ae7d9b8fd5c05b99f0..2069dfe3b964f177f370b3d748f122e686dce1d6 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 5326488ec47455e62c4ad6709d9878b41609c73f..c1a4fab6c8ab37b316ff71f3de2f0cc8459b4661 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 23b304626978e9864d58d34c1500c103d7e9eaf1..4545b7200959eaa5a0155f24e10b71dd37ff5107 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
 }