From: Tom Rini Date: Fri, 15 Nov 2013 17:20:33 +0000 (-0500) Subject: TI:omap: Update u-boot-spl.lds for i2c multibus/multiadapter update X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=5e995c00f60596d6e8a6d4ceb9a544cedc1bc838;p=u-boot.git 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 --- 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 989083c808..02aa129733 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 = .;