diff options
author | Nico Huber <nico.h@gmx.de> | 2016-01-23 01:24:33 +0100 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2016-01-28 00:31:32 +0100 |
commit | 98fc426a98db7e4dd5fea334edec720721d2a89c (patch) | |
tree | 16a143c645ccf8bdc13ef38ef700bcc8ae101199 /src/include | |
parent | 81b09f40087d1a00afe30e379d2e8460203b1c5c (diff) |
Move object files to $(obj)/<class>/
Instead of tagging object files with .<class>, move them to a <class>
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 <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/13181
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/memlayout.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |