New patch to review for coreboot: 3ae9b80 Use __ROMSTAGE__ to denote romstage

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10020

-gerrit

commit 3ae9b802e064c70e003bedd89bd56e41d0b7207e
Author: Patrick Georgi 
Date:   Tue Apr 28 22:43:31 2015 +0200

Use __ROMSTAGE__ to denote romstage

There were some remaining places that used __PRE_RAM__ for
    romstage, while it really means 'bootblock or romstage'.

Change-Id: Id9ba0486ee56ea4a27425d826a9256cc20f5b518
    Signed-off-by: Patrick Georgi 
---
 src/arch/x86/Makefile.inc | 4 ++--
 src/include/rules.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a2e68cc..8b37d7a 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -182,12 +182,12 @@ $(objcbfs)/romstage%.elf: $(objcbfs)/romstage%.debug

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
    printf "    ROMCC      romstage.inc\n"
-	$(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(CPPFLAGS_romstage) $< -o $@
+	$(ROMCC) -c -S $(ROMCCFLAGS) -D__ROMSTAGE__ -D__PRE_RAM__ -I. $(CPPFLAGS_romstage) $< -o $@
 else

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
    @printf "    CC         romstage.inc\n"
-	$(CC_romstage) $(CPPFLAGS_romstage) $(CFLAGS_romstage) -MMD -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
+	$(CC_romstage) $(CPPFLAGS_romstage) $(CFLAGS_romstage) -MMD -D__ROMSTAGE__ -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
    @printf "    POST       romstage.inc\n"
diff --git a/src/include/rules.h b/src/include/rules.h
index 3f5262c..1a27fc6 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -31,7 +31,7 @@
 #define ENV_SECMON 0
 #define ENV_VERSTAGE 0

-#elif defined(__PRE_RAM__)
+#elif defined(__ROMSTAGE__)
 #define ENV_BOOTBLOCK 0
 #define ENV_ROMSTAGE 1
 #define ENV_RAMSTAGE 0