summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-03-15 17:56:29 -0400
committerTom Rini <trini@konsulko.com>2016-03-16 15:27:55 -0400
commitf8a4826383860318d90079bf40402447d369ad87 (patch)
tree4fb79176e7b73e91b1e7bce3a4bf7c297811cd9f /arch
parentd08fedf691dcf4137df406110b7c6f6007f42ee3 (diff)
downloadtalos-obmc-uboot-f8a4826383860318d90079bf40402447d369ad87.tar.gz
talos-obmc-uboot-f8a4826383860318d90079bf40402447d369ad87.zip
spl: arm: Make sure to include all of the u_boot_list entries
Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well. While doing this, it's best to simply include all linker lists to future proof ourselves. Cc: Andreas Bießmann <andreas.devel@googlemail.com> Acked-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reported-by: Nishanth Menon <nm@ti.com> Tested-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/omap-common/u-boot-spl.lds2
-rw-r--r--arch/arm/cpu/u-boot-spl.lds9
-rw-r--r--arch/arm/mach-at91/arm926ejs/u-boot-spl.lds3
-rw-r--r--arch/arm/mach-at91/armv7/u-boot-spl.lds3
-rw-r--r--arch/arm/mach-zynq/u-boot-spl.lds7
5 files changed, 9 insertions, 15 deletions
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 ccd0c8352e..8fec715ca5 100644
--- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
@@ -35,7 +35,7 @@ SECTIONS
. = ALIGN(4);
.u_boot_list : {
- KEEP(*(SORT(.u_boot_list*_i2c_*)));
+ KEEP(*(SORT(.u_boot_list*)));
} >.sram
. = ALIGN(4);
diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index c5b4f7ce5e..068163b73a 100644
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -32,15 +32,8 @@ SECTIONS
}
. = ALIGN(4);
-#ifdef CONFIG_SPL_DM
.u_boot_list : {
- KEEP(*(SORT(.u_boot_list_*_driver_*)));
- KEEP(*(SORT(.u_boot_list_*_uclass_*)));
- }
-#endif
- . = .;
- .u_boot_list : {
- KEEP(*(SORT(.u_boot_list*_i2c_*)));
+ KEEP(*(SORT(.u_boot_list*)));
}
. = ALIGN(4);
diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
index acadd1d4c4..1b0420611e 100644
--- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
+++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
@@ -30,6 +30,9 @@ SECTIONS
.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
. = ALIGN(4);
+ .u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+
+ . = ALIGN(4);
__image_copy_end = .;
.end :
diff --git a/arch/arm/mach-at91/armv7/u-boot-spl.lds b/arch/arm/mach-at91/armv7/u-boot-spl.lds
index eccca43a42..c667c5555b 100644
--- a/arch/arm/mach-at91/armv7/u-boot-spl.lds
+++ b/arch/arm/mach-at91/armv7/u-boot-spl.lds
@@ -37,6 +37,9 @@ SECTIONS
.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
. = ALIGN(4);
+ .u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+
+ . = ALIGN(4);
__image_copy_end = .;
.end :
diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds
index ecdf6a031e..9a59164c87 100644
--- a/arch/arm/mach-zynq/u-boot-spl.lds
+++ b/arch/arm/mach-zynq/u-boot-spl.lds
@@ -38,16 +38,11 @@ SECTIONS
} > .sram
. = ALIGN(4);
-#ifdef CONFIG_SPL_DM
.u_boot_list : {
- KEEP(*(SORT(.u_boot_list_*_driver_*)));
- KEEP(*(SORT(.u_boot_list_*_uclass_*)));
+ KEEP(*(SORT(.u_boot_list*)));
} > .sram
. = ALIGN(4);
-#endif
-
- . = .;
_image_binary_end = .;
OpenPOWER on IntegriCloud