mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Blackfin: tweak objects specified before embedded environment
The partial linking patch changes how objects are specified to the linker and breaks boards with an embedded environment. So we need to tweak the list of objects we specify via the linker script that go in the gap before the embedded env to work with this new behavior. This fixes linker errors for all the boards in question. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
4024242669
commit
c70e7ddb7e
10 changed files with 30 additions and 64 deletions
|
@ -111,13 +111,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -122,13 +122,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -111,13 +111,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -118,13 +118,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -115,13 +115,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -95,15 +95,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
lib/zlib.o (.text .text.*); \
|
||||
board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -103,13 +103,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -104,13 +104,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -95,15 +95,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
lib/zlib.o (.text .text.*); \
|
||||
board/ibf-dsp561/ibf-dsp561.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -104,13 +104,10 @@
|
|||
* it linked after the configuration sector.
|
||||
*/
|
||||
# define LDS_BOARD_TEXT \
|
||||
arch/blackfin/cpu/traps.o (.text .text.*); \
|
||||
arch/blackfin/cpu/interrupt.o (.text .text.*); \
|
||||
arch/blackfin/cpu/serial.o (.text .text.*); \
|
||||
common/dlmalloc.o (.text .text.*); \
|
||||
lib/crc32.o (.text .text.*); \
|
||||
arch/blackfin/lib/libblackfin.o (.text*); \
|
||||
arch/blackfin/cpu/libblackfin.o (.text*); \
|
||||
. = DEFINED(env_offset) ? env_offset : .; \
|
||||
common/env_embedded.o (.text .text.*);
|
||||
common/env_embedded.o (.text*);
|
||||
#endif
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue