Aligned SPC5 GHS linker scripts.

git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11628 110e8d01-0319-4d1e-a829-52ad28d1bb01

12 files changed, 54 insertions, 180 deletions

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC560B50.ld b/os/common/startup/e200/compilers/GHS/ld/SPC560B50.ld
index db726b8fd..b2bfaf025 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC560B50.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC560B50.ld
@@ -114,19 +114,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC560B60.ld b/os/common/startup/e200/compilers/GHS/ld/SPC560B60.ld
index 8e3b6e451..548d0d8d8 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC560B60.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC560B60.ld
@@ -114,19 +114,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC560B64.ld b/os/common/startup/e200/compilers/GHS/ld/SPC560B64.ld
index 93f14e00b..39fb14110 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC560B64.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC560B64.ld
@@ -114,19 +114,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC560D40.ld b/os/common/startup/e200/compilers/GHS/ld/SPC560D40.ld
index b8e6d505a..11dffc622 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC560D40.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC560D40.ld
@@ -114,19 +114,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC560P50.ld b/os/common/startup/e200/compilers/GHS/ld/SPC560P50.ld
index 40f074641..e4afb2a51 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC560P50.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC560P50.ld
@@ -114,19 +114,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC563M64.ld b/os/common/startup/e200/compilers/GHS/ld/SPC563M64.ld
deleted file mode 100644
index a934f280b..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC563M64.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563M64 memory setup.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 1536k

-    ram       : org = 0x40000000, len = 94k

-}

-

-INCLUDE rules_z3.ld

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC564A70.ld b/os/common/startup/e200/compilers/GHS/ld/SPC564A70.ld
deleted file mode 100644
index 0cc7207a1..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC564A70.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563A70 memory setup.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 2M

-    ram       : org = 0x40000000, len = 128k

-}

-

-INCLUDE rules_z4.ld

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC564A80.ld b/os/common/startup/e200/compilers/GHS/ld/SPC564A80.ld
deleted file mode 100644
index f0ee57581..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC564A80.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC563A80 memory setup.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 4M

-    ram       : org = 0x40000000, len = 192k

-}

-

-INCLUDE rules_z4.ld

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC56EC74.ld b/os/common/startup/e200/compilers/GHS/ld/SPC56EC74.ld
index 5beb58398..b935340c5 100644
--- a/os/common/startup/e200/compilers/GHS/ld/SPC56EC74.ld
+++ b/os/common/startup/e200/compilers/GHS/ld/SPC56EC74.ld
@@ -108,19 +108,24 @@ SECTIONS
 

     .data ALIGN(4) : AT(__romdata_start__)

     {

-        . = ALIGN(4);

         __data_start__ = .;

         *(.data)

         "*(.data.*)"

-        __sdata_start__ = . + 0x8000;

-        *(.sdata)

-        "*(.sdata.*)"

         . = ALIGN(4);

         *(.ramtext)

         . = ALIGN(4);

         __data_end__ = .;

     } > ram

 

+    __romsdata_start__ = (__data_end__ - __data_start__) + __romdata_start__;

+

+    .sdata ALIGN(4) : AT(__romsdata_start__)

+    {

+         __sdata_start__ = . + 0x8000;

+        *(.sdata)

+        "*(.sdata.*)"

+    } > ram

+

     .sbss ALIGN(4) :

     {

         __bss_start__ = .;

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC56EL54_LSM.ld b/os/common/startup/e200/compilers/GHS/ld/SPC56EL54_LSM.ld
deleted file mode 100644
index 06232c15a..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC56EL54_LSM.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC56EL54 memory setup in LSM mode.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 768k

-    ram       : org = 0x40000000, len = 128k

-}

-

-INCLUDE rules_z4.ld

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC56EL60_LSM.ld b/os/common/startup/e200/compilers/GHS/ld/SPC56EL60_LSM.ld
deleted file mode 100644
index 4884fee19..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC56EL60_LSM.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC56EL60 memory setup in LSM mode.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 1M

-    ram       : org = 0x40000000, len = 128k

-}

-

-INCLUDE rules_z4.ld

diff --git a/os/common/startup/e200/compilers/GHS/ld/SPC56EL70_LSM.ld b/os/common/startup/e200/compilers/GHS/ld/SPC56EL70_LSM.ld
deleted file mode 100644
index e4b907b43..000000000
--- a/os/common/startup/e200/compilers/GHS/ld/SPC56EL70_LSM.ld
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*

- * SPC56EL70 memory setup in LSM mode.

- */

-MEMORY

-{

-    flash     : org = 0x00000000, len = 2M

-    ram       : org = 0x40000000, len = 192k

-}

-

-INCLUDE rules_z4.ld