* emulparams/avr1200.sh (DATA_START): Define as 0x60.

	* emulparams/avr23xx.sh: Likewise.
	* emulparams/avr4433.sh: Likewise.
	* emulparams/avr44x4.sh: Likewise.
	* emulparams/avr85xx.sh: Likewise.
	* emulparams/avrmega103.sh: Likewise.
	* emulparams/avrmega161.sh: Likewise.
	* emulparams/avrmega603.sh: Likewise.
	* scripttempl/elf32avr.sc: Use DATA_START instead of 0x60.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0202545f232603c22de735908289cdb1743d9ada..7fac65362e5d288018150789f7a265c371430b20 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,15 @@
+2002-01-07  Marek Michalkiewicz  <marekm@amelek.gda.pl>
+
+       * emulparams/avr1200.sh (DATA_START): Define as 0x60.
+       * emulparams/avr23xx.sh: Likewise.
+       * emulparams/avr4433.sh: Likewise.
+       * emulparams/avr44x4.sh: Likewise.
+       * emulparams/avr85xx.sh: Likewise.
+       * emulparams/avrmega103.sh: Likewise.
+       * emulparams/avrmega161.sh: Likewise.
+       * emulparams/avrmega603.sh: Likewise.
+       * scripttempl/elf32avr.sc: Use DATA_START instead of 0x60.
+
 2002-01-08  Alexandre Oliva  <aoliva@redhat.com>
 
        * ldlang.c (walk_wild_section): Exclude object file if enclosing

diff --git a/ld/emulparams/avr1200.sh b/ld/emulparams/avr1200.sh
index 24607e5f6fffe4f04e85c40900758f43bf14aa77..0bbcecd8ed9a4e207722a8546950108f3cdb8565 100644 (file)
--- a/ld/emulparams/avr1200.sh
+++ b/ld/emulparams/avr1200.sh
@@ -9,4 +9,5 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=1K
 DATA_LENGTH=0
 EEPROM_LENGTH=64
+DATA_START=0x60
 STACK=0

diff --git a/ld/emulparams/avr23xx.sh b/ld/emulparams/avr23xx.sh
index e85ef8621a97ea3ce16196166ef9cd5d9e42334e..49bd5adbc92ce02a5fd7ab22312c7c9bf159fe31 100644 (file)
--- a/ld/emulparams/avr23xx.sh
+++ b/ld/emulparams/avr23xx.sh
@@ -9,5 +9,6 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=2K
 DATA_LENGTH=128
 EEPROM_LENGTH=128
+DATA_START=0x60
 STACK=0x0DF
 

diff --git a/ld/emulparams/avr4433.sh b/ld/emulparams/avr4433.sh
index 179fe1c67650bc16c41050892ac01060e3bb678e..0cfb47109886f91fb7ca99979bbbef2854cb8216 100644 (file)
--- a/ld/emulparams/avr4433.sh
+++ b/ld/emulparams/avr4433.sh
@@ -9,5 +9,6 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=4K
 DATA_LENGTH=128
 EEPROM_LENGTH=256
+DATA_START=0x60
 STACK=0x0DF
 

diff --git a/ld/emulparams/avr44x4.sh b/ld/emulparams/avr44x4.sh
index 07fc57ec06ec8adcec190b9107887ad84ff10928..7e9fa48fc4c0ef597c4ca60760be92b9ccfc81cb 100644 (file)
--- a/ld/emulparams/avr44x4.sh
+++ b/ld/emulparams/avr44x4.sh
@@ -9,5 +9,6 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=4K
 DATA_LENGTH=256
 EEPROM_LENGTH=256
+DATA_START=0x60
 STACK=0x15F
 

diff --git a/ld/emulparams/avr85xx.sh b/ld/emulparams/avr85xx.sh
index f3700bd8c36627d174e63c5df19cd25d244a60f9..f925795045f490afcc764a65d4fc24d8f6dee026 100644 (file)
--- a/ld/emulparams/avr85xx.sh
+++ b/ld/emulparams/avr85xx.sh
@@ -9,5 +9,6 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=8K
 DATA_LENGTH=512
 EEPROM_LENGTH=512
+DATA_START=0x60
 STACK=0x25F
 

diff --git a/ld/emulparams/avrmega103.sh b/ld/emulparams/avrmega103.sh
index ca5a61e54b5d528b7a12d86a6766a9ee18fde42a..5a59b35bf9ccd331c25215437acaa077848fd16e 100644 (file)
--- a/ld/emulparams/avrmega103.sh
+++ b/ld/emulparams/avrmega103.sh
@@ -9,4 +9,5 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=128K
 DATA_LENGTH=4000
 EEPROM_LENGTH=4K
+DATA_START=0x60
 STACK=0x0FFF

diff --git a/ld/emulparams/avrmega161.sh b/ld/emulparams/avrmega161.sh
index fa5522216e32b716cf490b3f10d5a439e5f3ad83..2f97b72c268a71a7b05b76730577627f9ef3c5b4 100644 (file)
--- a/ld/emulparams/avrmega161.sh
+++ b/ld/emulparams/avrmega161.sh
@@ -9,5 +9,6 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=16K
 DATA_LENGTH=1K
 EEPROM_LENGTH=512
+DATA_START=0x60
 STACK=0x45F
 

diff --git a/ld/emulparams/avrmega603.sh b/ld/emulparams/avrmega603.sh
index 4d60895650c8f098ca56d0d625c642bcc0f09129..e4823fa7241f8c4daa75cb46c8cd17ec689bbc58 100644 (file)
--- a/ld/emulparams/avrmega603.sh
+++ b/ld/emulparams/avrmega603.sh
@@ -9,4 +9,5 @@ TEMPLATE_NAME=generic
 TEXT_LENGTH=64K
 DATA_LENGTH=4000
 EEPROM_LENGTH=2K
+DATA_START=0x60
 STACK=0x0FFF

diff --git a/ld/scripttempl/elf32avr.sc b/ld/scripttempl/elf32avr.sc
index 0673945b854dc66225369d38cee924a764736b26..ba9ec22ebcd09904b84b5a617fb33661f994618f 100644 (file)
--- a/ld/scripttempl/elf32avr.sc
+++ b/ld/scripttempl/elf32avr.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 = (0x800000 + $DATA_START), LENGTH = $DATA_LENGTH
   eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = $EEPROM_LENGTH
 }