summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/u-boot-spl.lds
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-24 17:01:48 (GMT)
committerTom Rini <trini@ti.com>2014-11-24 17:01:48 (GMT)
commit1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch)
tree56fe759e62f129dc055b6f6a22f299f6c8b5cdde /arch/arm/cpu/u-boot-spl.lds
parent746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff)
parent17b28edb37a33d0c89089faf36e4edd7084f65fa (diff)
downloadu-boot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.xz
Merge git://git.denx.de/u-boot-dm
Conflicts: drivers/serial/serial-uclass.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/u-boot-spl.lds')
-rw-r--r--arch/arm/cpu/u-boot-spl.lds7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index 4beddf0..a69b006 100644
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -34,6 +34,13 @@ SECTIONS
. = ALIGN(4);
. = .;
+#ifdef CONFIG_SPL_DM
+ .u_boot_list : {
+ KEEP(*(SORT(.u_boot_list_*_driver_*)));
+ KEEP(*(SORT(.u_boot_list_*_uclass_*)));
+ }
+#endif
+ . = ALIGN(4);
__image_copy_end = .;