From 98fc426a98db7e4dd5fea334edec720721d2a89c Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 23 Jan 2016 01:24:33 +0100 Subject: Move object files to $(obj)// Instead of tagging object files with ., move them to a directory below $(obj)/. This way we can keep a 1:1 mapping between source- and object-file names. The 1:1 mapping is a prerequisite for Ada, where the compiler refuses any other object-file name. Tested by verifying that the resulting coreboot.rom files didn't change for all of Jenkins' abuild configurations. Change-Id: Idb7a8abec4ea0a37021d9fc24cc8583c4d3bf67c Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/13181 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/include/memlayout.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/memlayout.h') diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 42d56082fa..e62782aacd 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -106,7 +106,7 @@ SET_COUNTER(bootblock, addr) \ _ = ASSERT(_eprogram - _program <= sz, \ STR(Bootblock exceeded its allotted size! (sz))); \ - INCLUDE "lib/program.bootblock.ld" + INCLUDE "bootblock/lib/program.ld" #else #define BOOTBLOCK(addr, sz) \ SET_COUNTER(bootblock, addr) \ @@ -118,7 +118,7 @@ SET_COUNTER(romstage, addr) \ _ = ASSERT(_eprogram - _program <= sz, \ STR(Romstage exceeded its allotted size! (sz))); \ - INCLUDE "lib/program.romstage.ld" + INCLUDE "romstage/lib/program.ld" #else #define ROMSTAGE(addr, sz) \ SET_COUNTER(romstage, addr) \ @@ -130,7 +130,7 @@ SET_COUNTER(ramstage, addr) \ _ = ASSERT(_eprogram - _program <= sz, \ STR(Ramstage exceeded its allotted size! (sz))); \ - INCLUDE "lib/program.ramstage.ld" + INCLUDE "ramstage/lib/program.ld" #else #define RAMSTAGE(addr, sz) \ SET_COUNTER(ramstage, addr) \ @@ -149,7 +149,7 @@ SET_COUNTER(verstage, addr) \ _ = ASSERT(_eprogram - _program <= sz, \ STR(Verstage exceeded its allotted size! (sz))); \ - INCLUDE "lib/program.verstage.ld" + INCLUDE "verstage/lib/program.ld" #define OVERLAP_VERSTAGE_ROMSTAGE(addr, size) VERSTAGE(addr, size) #else -- cgit v1.2.3