diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-02-13 19:45:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-02-21 12:11:50 +0000 |
| commit | 0ff32143d2e733a64d548e78760218c8567d70ef (patch) | |
| tree | e3c0c406999d1fcc54313a37d2e16e20c2c2bced | |
| parent | 14dcbbd384abc25d475fd2021db3007a22383e46 (diff) | |
Fix linux-system-semi.axf build failure from clean
We were failing to build linux-system-semi.axf in a clean tree
because even if SEMIHOSTING was defined we still had a spurious
INPUT(boot.o), which is harmless if boot.o exists but fails
if it does not.
In fact the INPUT() commands for the .o files are unnecessary
because ld will pull in the correct .o files because the SECTIONS
command has a non-wildcard reference to them. So just drop the
unneeded INPUT() commands rather than adding more ifdefs.
(The INPUT() commands for the binary blobs are still required.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | model.lds.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/model.lds.S b/model.lds.S index 3af4e07..fca017b 100644 --- a/model.lds.S +++ b/model.lds.S @@ -11,8 +11,6 @@ OUTPUT_FORMAT("elf32-littlearm") OUTPUT_ARCH(arm) TARGET(binary) -INPUT(./monitor.o) -INPUT(./boot.o) #ifndef SEMIHOSTING INPUT(./uImage) #ifdef USE_INITRD |