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>

diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index 4b6e0f6fa48480a8d462d6e55c268b5ae65c8a75..c5b4f7ce5e9e4091a1d7d51e40ac9969a5a3b8c3 100644 (file)
--- 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 = .;