summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2013-02-14 11:32:29 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-02-14 21:32:02 +0100
commitc2e8cf56757b72b963753848d46c7932445029d5 (patch)
tree7f0c68136ea13c3a26e9e5267b97896b7bdead17
parent7df4ec03035d0bbc6f206527164ac4839d29cd0b (diff)
libpayload; put the ldscript into an arch-dependent directory path
Since it's utterly architecture-dependent, put it in arch/x86. Avoid the temptation to make yet another directory with just one file in it. Fix the makefile to pick up the proper arch-dependent script. Change-Id: I21ea02551a97bdcbc38419714f3b38cf8335c178 Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-on: http://review.coreboot.org/2389 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org>
-rw-r--r--payloads/libpayload/Makefile.inc2
-rw-r--r--payloads/libpayload/arch/x86/libpayload.ldscript (renamed from payloads/libpayload/lib/libpayload.ldscript)0
2 files changed, 1 insertions, 1 deletions
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index 908d0e7637..4c434a3d25 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -97,7 +97,7 @@ install: real-target
for lib in $(library-targets); do \
install -m 644 $$lib $(DESTDIR)/libpayload/lib/; \
done
- install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/
+ install -m 644 arch/$(ARCHDIR-y)/libpayload.ldscript $(DESTDIR)/libpayload/lib/
install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
install -m 644 $(obj)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y)
printf " INSTALL $(DESTDIR)/libpayload/include\n"
diff --git a/payloads/libpayload/lib/libpayload.ldscript b/payloads/libpayload/arch/x86/libpayload.ldscript
index 3e7d4cc318..3e7d4cc318 100644
--- a/payloads/libpayload/lib/libpayload.ldscript
+++ b/payloads/libpayload/arch/x86/libpayload.ldscript