summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-15 12:20:33 -0500
committerTom Rini <trini@ti.com>2013-11-15 12:20:33 -0500
commit5e995c00f60596d6e8a6d4ceb9a544cedc1bc838 (patch)
tree68f20cc0ad768ef33ce26f0f798e090d0c89505e /arch
parentc3ebb8c38a5da5e40da2786c5d850d1f6555ff95 (diff)
downloadu-boot-imx-5e995c00f60596d6e8a6d4ceb9a544cedc1bc838.zip
u-boot-imx-5e995c00f60596d6e8a6d4ceb9a544cedc1bc838.tar.gz
u-boot-imx-5e995c00f60596d6e8a6d4ceb9a544cedc1bc838.tar.bz2
TI:omap: Update u-boot-spl.lds for i2c multibus/multiadapter update
In 6789e84 we update u-boot-spl.lds for OMAP to ensure we include adapter information, as we use i2c during SPL. However, the regex used also means we included commands that may have been built. On omap5_uevm this leads to a failure as we include the command from the do_tca642x command, and fail to link. The fix is to restrict our regex to only the i2c list parts. Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/omap-common/u-boot-spl.lds3
1 files changed, 2 insertions, 1 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 989083c..02aa129 100644
--- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
@@ -34,8 +34,9 @@ SECTIONS
. = ALIGN(4);
.u_boot_list : {
- KEEP(*(SORT(.u_boot_list*)));
+ KEEP(*(SORT(.u_boot_list*_i2c_*)));
} >.sram
+
. = ALIGN(4);
__image_copy_end = .;
_end = .;