arm: Add missing .vectors section to linker scripts

Commit 41623c9 'arm: move exception handling out of start.S files' missed some
linker scripts. Hence, some boards no longer had exception handling linked since
this commit. Restore the original behavior by adding the .vectors section to
these linker scripts.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>

diff --git a/arch/arm/cpu/arm1136/u-boot-spl.lds b/arch/arm/cpu/arm1136/u-boot-spl.lds
index 0299902f203522f0fe8a5831da4614ae7bfb0771..97e4a8bc873fac91f07f2b3c5db2cf36f8b8822d 100644 (file)
--- a/arch/arm/cpu/arm1136/u-boot-spl.lds
+++ b/arch/arm/cpu/arm1136/u-boot-spl.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
        __start = .;
+         *(.vectors)
          arch/arm/cpu/arm1136/start.o  (.text*)
          *(.text*)
        } >.sram

diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
index f4bf8ac1dd4bbff9af63abbebf47d20acaf81cbd..bf2ac13056bd21477700af55ad65897d86a1f205 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
@@ -21,6 +21,7 @@ SECTIONS
        . = ALIGN(4);
        .text   :
        {
+               *(.vectors)
                arch/arm/cpu/arm926ejs/mxs/start.o      (.text*)
                *(.text*)
        }

diff --git a/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds b/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
index b1c28c9442dff555aa228beccb4d999594ae8a57..07cf2678782c26b9c63481b99aeda39132a62724 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
                __start = .;
+               *(.vectors)
                arch/arm/cpu/armv7/start.o      (.text)
                *(.text*)
        } >.sram

diff --git a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
index 745603d0fe7aa4302db5f2f22cbd5e4ea9948d53..ccd0c8352e21461165da0fc415e9d15eee1b5855 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
                __start = .;
+               *(.vectors)
                arch/arm/cpu/armv7/start.o      (.text*)
                *(.text*)
        } >.sram

diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
index 4282beb395071ec2e834b14b51442522ddae2042..db9bdad7d6c94e62308b89574719c75d17ed5054 100644 (file)
--- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
@@ -16,6 +16,7 @@ SECTIONS
        . = ALIGN(4);
        .text   :
        {
+               *(.vectors)
                arch/arm/cpu/armv7/start.o      (.text*)
                *(.text*)
        } >.sdram

diff --git a/arch/arm/cpu/at91-common/u-boot-spl.lds b/arch/arm/cpu/at91-common/u-boot-spl.lds
index 57ac1eb24232c587a659ad4e2f246ae3726eccaf..eccca43a423be92cd4a164d07493c70dfb38802e 100644 (file)
--- a/arch/arm/cpu/at91-common/u-boot-spl.lds
+++ b/arch/arm/cpu/at91-common/u-boot-spl.lds
@@ -25,6 +25,7 @@ SECTIONS
        .text      :
        {
                __start = .;
+               *(.vectors)
                arch/arm/cpu/armv7/start.o      (.text*)
                *(.text*)
        } >.sram

diff --git a/board/Barix/ipam390/u-boot-spl-ipam390.lds b/board/Barix/ipam390/u-boot-spl-ipam390.lds
index 8604696be7e218b9c1f10a8a28ab798dd24a7e11..5f290ec7dbcb69a27e32027af23908d1b136da67 100644 (file)
--- a/board/Barix/ipam390/u-boot-spl-ipam390.lds
+++ b/board/Barix/ipam390/u-boot-spl-ipam390.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
        __start = .;
+         *(.vectors)
          arch/arm/cpu/arm926ejs/start.o        (.text*)
          *(.text*)
        } >.sram

diff --git a/board/ait/cam_enc_4xx/u-boot-spl.lds b/board/ait/cam_enc_4xx/u-boot-spl.lds
index c0d09adf7c72bcd5de9eb7c9c3c22ad532d88a5a..f5c19df0d31cd8ae9ba91112e566b00ba6b03166 100644 (file)
--- a/board/ait/cam_enc_4xx/u-boot-spl.lds
+++ b/board/ait/cam_enc_4xx/u-boot-spl.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
        __start = .;
+         *(.vectors)
          arch/arm/cpu/arm926ejs/start.o        (.text*)
          *(.text*)
        } >.sram

diff --git a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
index de21a132b056b7ab9ad12491eacd5a2df783e821..ab4f50cbbeb5c86a6ab1e03dfe41230fc1d1c216 100644 (file)
--- a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
+++ b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
@@ -22,6 +22,7 @@ SECTIONS
        .text      :
        {
        __start = .;
+         *(.vectors)
          arch/arm/cpu/arm926ejs/start.o        (.text*)
          *(.text*)
        } >.sram

diff --git a/board/davinci/da8xxevm/u-boot-spl-hawk.lds b/board/davinci/da8xxevm/u-boot-spl-hawk.lds
index 299226b95fadc090297dc6c195a9dc0423512e4e..682f2685dc11293111419f77d9913dff927157f1 100644 (file)
--- a/board/davinci/da8xxevm/u-boot-spl-hawk.lds
+++ b/board/davinci/da8xxevm/u-boot-spl-hawk.lds
@@ -18,6 +18,7 @@ SECTIONS
        . = ALIGN(4);
        .text      :
        {
+         *(.vectors)
          arch/arm/cpu/arm926ejs/start.o                (.text*)
          arch/arm/cpu/arm926ejs/davinci/built-in.o     (.text*)
          drivers/mtd/nand/built-in.o                   (.text*)

diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds
index b22f9e07bbbf47f2c1a0d590c2da65c41245541d..4a933c87e9fb2623a5ebe2222d0f994484eba047 100644 (file)
--- a/board/samsung/common/exynos-uboot-spl.lds
+++ b/board/samsung/common/exynos-uboot-spl.lds
@@ -21,6 +21,7 @@ SECTIONS
        .text :
        {
                __start = .;
+               *(.vectors)
                arch/arm/cpu/armv7/start.o (.text*)
                *(.text*)
        } >.sram

diff --git a/board/vpac270/u-boot-spl.lds b/board/vpac270/u-boot-spl.lds
index 5dbf94e44e6faf84a1fc42cbe1150d268df1118a..a10ea71e9d52c1856d33c6209053e3653d09ce62 100644 (file)
--- a/board/vpac270/u-boot-spl.lds
+++ b/board/vpac270/u-boot-spl.lds
@@ -19,6 +19,7 @@ SECTIONS
        . = CONFIG_SPL_TEXT_BASE;
        .text.0 :
        {
+               *(.vectors)
                arch/arm/cpu/pxa/start.o                (.text*)
                arch/arm/lib/built-in.o                 (.text*)
                board/vpac270/built-in.o                (.text*)