summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-07-24 12:51:42 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-07-24 12:51:42 -0600
commit00eb1484b5b5261ee85a02ccbd499f7a6d19f5ad (patch)
treeb19ee2e0e154714b7f8099c46d3bb41e0526be21
parentf321b903f8a03feb5997f39ff865d7e7e60abfad (diff)
downloadpx4-nuttx-00eb1484b5b5261ee85a02ccbd499f7a6d19f5ad.tar.gz
px4-nuttx-00eb1484b5b5261ee85a02ccbd499f7a6d19f5ad.tar.bz2
px4-nuttx-00eb1484b5b5261ee85a02ccbd499f7a6d19f5ad.zip
Fix SAMA5 vector linking issue
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_vectortab.S3
-rw-r--r--nuttx/configs/sama5d3x-ek/scripts/ddram.ld2
-rw-r--r--nuttx/configs/sama5d3x-ek/scripts/isram.ld2
-rw-r--r--nuttx/configs/sama5d3x-ek/scripts/pg-sram.ld2
4 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/armv7-a/arm_vectortab.S b/nuttx/arch/arm/src/armv7-a/arm_vectortab.S
index e01ae13b7..b22261e04 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_vectortab.S
+++ b/nuttx/arch/arm/src/armv7-a/arm_vectortab.S
@@ -58,7 +58,8 @@
* Vector initialization block
****************************************************************************/
- .globl _vector_start
+ .section .vectors, "ax"
+ .globl _vector_start
/* These will be relocated to VECTOR_BASE. */
diff --git a/nuttx/configs/sama5d3x-ek/scripts/ddram.ld b/nuttx/configs/sama5d3x-ek/scripts/ddram.ld
index fcc213f61..5aa3bda06 100644
--- a/nuttx/configs/sama5d3x-ek/scripts/ddram.ld
+++ b/nuttx/configs/sama5d3x-ek/scripts/ddram.ld
@@ -56,7 +56,7 @@ SECTIONS
{
.text : {
_stext = ABSOLUTE(.);
- *(.vectors)
+ KEEP (*(.vectors))
*(.text .text.*)
*(.fixup)
*(.gnu.warning)
diff --git a/nuttx/configs/sama5d3x-ek/scripts/isram.ld b/nuttx/configs/sama5d3x-ek/scripts/isram.ld
index 035fd5747..aeb1668b7 100644
--- a/nuttx/configs/sama5d3x-ek/scripts/isram.ld
+++ b/nuttx/configs/sama5d3x-ek/scripts/isram.ld
@@ -53,7 +53,7 @@ SECTIONS
{
.text : {
_stext = ABSOLUTE(.);
- *(.vectors)
+ KEEP (*(.vectors))
*(.text .text.*)
*(.fixup)
*(.gnu.warning)
diff --git a/nuttx/configs/sama5d3x-ek/scripts/pg-sram.ld b/nuttx/configs/sama5d3x-ek/scripts/pg-sram.ld
index 6cf0591a2..ea2eb026e 100644
--- a/nuttx/configs/sama5d3x-ek/scripts/pg-sram.ld
+++ b/nuttx/configs/sama5d3x-ek/scripts/pg-sram.ld
@@ -81,7 +81,7 @@ SECTIONS
{
.locked : {
_slocked = ABSOLUTE(.);
- *(.vectors)
+ KEEP (*(.vectors))
up_head.o locked.r (.text .text.*)
up_head.o locked.r (.fixup)
up_head.o locked.r (.gnu.warning)