summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-06-23 15:38:30 -0600
committerSimon Glass <sjg@chromium.org>2015-07-21 17:39:21 -0600
commit4eae498e68a3a6bdd8b18a8cb9191196e8843740 (patch)
tree32da84ff39e22692004fb374fdeaa357734d6b30
parentfa78e0a37173211d75e9606257bc028f066962cf (diff)
downloadtalos-obmc-uboot-4eae498e68a3a6bdd8b18a8cb9191196e8843740.tar.gz
talos-obmc-uboot-4eae498e68a3a6bdd8b18a8cb9191196e8843740.zip
dm: arm: Put driver model I2C drivers before legacy ones
Driver-model I2C drivers can be picked up by the linker script rule for legacy drivers. Change the order to avoid this. We could make the legacy code depend on !CONFIG_DM_I2C but that is not necessary and it is good to keep conditions to a minimum. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/cpu/u-boot-spl.lds10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index 4b6e0f6fa4..c5b4f7ce5e 100644
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -32,17 +32,17 @@ SECTIONS
}
. = ALIGN(4);
- .u_boot_list : {
- KEEP(*(SORT(.u_boot_list*_i2c_*)));
- }
-
- . = .;
#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_*)));
+ }
+
. = ALIGN(4);
__image_copy_end = .;
OpenPOWER on IntegriCloud