romcc:

- Set __PRE_RAM__ define per default
- Properly handle ignored (#ifdef'd out) #include lines

amd/serengeti_cheetah_fam10:
- write ACPI files to $(obj) instead of the top dir (alias $(CURDIR))

tinybootblock:
- provide a way to define code that should be added to the bootblock,
  to map the entire ROM for use by CBFS

amd/model_fxx, amd/model_10xxx:
- add CONFIG_SSE

walkcbfs.S:
- eliminate the use of two registers, to make space for romcc to wiggle

amd/serengeti_cheetah_fam10:
- use the enable_rom framework. not entirely functional yet

Boot-tested on emulation/qemu-x86
Build-tested on amd/serengeti_cheetah_fam10
amd/serengeti_cheetah_fam10 fails in amdht/ somewhere, but builds

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4994 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 12 insertions, 0 deletions

diff --git a/util/compareboard/compareboard b/util/compareboard/compareboard
index 7fb7e5e458..ce16317835 100755
--- a/util/compareboard/compareboard
+++ b/util/compareboard/compareboard
@@ -103,8 +103,12 @@ sed \
 	-e "/^CONFIG_GDB_STUB / d" \
 	-e "/^CONFIG_VIDEO_MB / d" \
 	-e "/^CONFIG_EXPERT / d" \
+	-e "/^CONFIG_SSE / d" \
 	-e "/^CONFIG_VGA_BIOS / d" \
 	-e "/^CONFIG_WARNINGS_ARE_ERRORS / d" \
+	-e "/^CONFIG_TINY_BOOTBLOCK / d" \
+	-e "/^CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT / d" \
+	-e "/^CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT / d" \
 	$A/new > $A/new.filtered
 
 normalize $A/old.filtered > $A/old.normalized
diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index 6f3a44bb70..5712f34040 100644
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -3616,6 +3616,7 @@ static void register_builtin_macros(struct compile_state *state)
 	tm = localtime(&now);
 
 	register_builtin_macro(state, "__ROMCC__", VERSION_MAJOR);
+	register_builtin_macro(state, "__PRE_RAM__", VERSION_MAJOR);
 	register_builtin_macro(state, "__ROMCC_MINOR__", VERSION_MINOR);
 	register_builtin_macro(state, "__FILE__", "\"This should be the filename\"");
 	register_builtin_macro(state, "__LINE__", "54321");
@@ -5453,6 +5454,13 @@ static void preprocess(struct compile_state *state, struct token *current_token)
 		name = 0;
 
 		pp_eat(state, TOK_MINCLUDE);
+		if (if_eat(state)) {
+			/* Find the end of the line */
+			while((tok = raw_peek(state)) != TOK_EOL) {
+				raw_eat(state, tok);
+			}
+			break;
+		}
 		tok = peek(state);
 		if (tok == TOK_LIT_STRING) {
 			struct token *tk;