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>

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 ccd0c8352e21461165da0fc415e9d15eee1b5855..8fec715ca56c85de2b6be7069ac748b1f7e065b4 100644 (file)
--- 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 c5b4f7ce5e9e4091a1d7d51e40ac9969a5a3b8c3..068163b73a65986dbd3ac48fc325be1370c2748e 100644 (file)
--- 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 acadd1d4c434272ba202933e4a8adb56955d00b1..1b0420611ed3d11221cf6e84e7af55936a45e36d 100644 (file)
--- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
+++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
@@ -29,6 +29,9 @@ SECTIONS
        . = ALIGN(4);
        .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
+       . = ALIGN(4);
+       .u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+
        . = ALIGN(4);
        __image_copy_end = .;
 

diff --git a/arch/arm/mach-at91/armv7/u-boot-spl.lds b/arch/arm/mach-at91/armv7/u-boot-spl.lds
index eccca43a423be92cd4a164d07493c70dfb38802e..c667c5555be57cc9e394180558819347d605755a 100644 (file)
--- a/arch/arm/mach-at91/armv7/u-boot-spl.lds
+++ b/arch/arm/mach-at91/armv7/u-boot-spl.lds
@@ -36,6 +36,9 @@ SECTIONS
        . = ALIGN(4);
        .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
+       . = ALIGN(4);
+       .u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+
        . = ALIGN(4);
        __image_copy_end = .;
 

diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds
index ecdf6a031ec31b197bc8fb799cbf1275020703cb..9a59164c876f359a2286e0a79be9e0599a1e215a 100644 (file)
--- 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 = .;