[U-Boot] [PATCH v2] spl: arm: Make sure to include u_boot_list_*_part_disk_*

[Tom Rini]

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.

Cc: Michal Simek <michal.simek at xilinx.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
Reported-by: Nishanth Menon <nm at ti.com>
Tested-by: Nishanth Menon <nm at ti.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
Changes in v2:
- Drop the CONFIG_SPL_DM tests for zynq as DM is the only case for zynq
  and while in here drop a now useless line.
---
 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds |    1 +
 arch/arm/cpu/u-boot-spl.lds                   |    1 +
 arch/arm/mach-zynq/u-boot-spl.lds             |    4 ----
 3 files changed, 2 insertions(+), 4 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 ccd0c83..9dccdc0 100644
--- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
@@ -35,6 +35,7 @@ SECTIONS
 
 	. = ALIGN(4);
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	} >.sram
 
diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index c5b4f7c..1805043 100644
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -40,6 +40,7 @@ SECTIONS
 #endif
 	. = .;
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	}
 
diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds
index ecdf6a0..a5c76a6 100644
--- a/arch/arm/mach-zynq/u-boot-spl.lds
+++ b/arch/arm/mach-zynq/u-boot-spl.lds
@@ -38,16 +38,12 @@ SECTIONS
 	} > .sram
 
 	. = ALIGN(4);
-#ifdef CONFIG_SPL_DM
 	.u_boot_list : {
 		KEEP(*(SORT(.u_boot_list_*_driver_*)));
 		KEEP(*(SORT(.u_boot_list_*_uclass_*)));
 	} > .sram
 
 	. = ALIGN(4);
-#endif
-
-	. = .;
 
 	_image_binary_end = .;
 
-- 
1.7.9.5