* 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 0202545..7fac653 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 24607e5..0bbcecd 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 e85ef86..49bd5ad 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 179fe1c..0cfb471 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 07fc57e..7e9fa48 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 f3700bd..f925795 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 ca5a61e..5a59b35 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 fa55222..2f97b72 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 4d60895..e4823fa 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 0673945..ba9ec22 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
 }