summaryrefslogtreecommitdiffstats
path: root/Makefile.inc
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2013-02-04 14:38:03 +0800
committerRonald G. Minnich <rminnich@gmail.com>2013-02-07 06:10:09 +0100
commit5f83f6cb7a3f179482db54aaff38f23795dc1acf (patch)
treebd94e259d2ae6fab8e4b993d04215b0964d8bf5f /Makefile.inc
parentc720d8d5d419d8e9128392cd7ab90e3a3fca1d4b (diff)
downloadcoreboot-staging-5f83f6cb7a3f179482db54aaff38f23795dc1acf.zip
coreboot-staging-5f83f6cb7a3f179482db54aaff38f23795dc1acf.tar.gz
armv7: Clean up arm/snow bootblock build process.
Remove duplicated / testing code and share more driver for bootblock, romstage and ramstage. The __PRE_RAM__ is now also defined in bootblock build stage, since bootblock is executed before RAM is initialized. Change-Id: I4f5469b1545631eee1cf9f2f5df93cbe3a58268b Signed-off-by: Hung-Te Lin <hungte@chromium.org> Reviewed-on: http://review.coreboot.org/2282 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 0b473e4..069bdfe 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -111,8 +111,8 @@ $(error Your current configuration requires binary-only components, but you did
endif
endif
-bootblock-c-ccopts:=-D__BOOT_BLOCK__
-bootblock-S-ccopts:=-D__BOOT_BLOCK__
+bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
+bootblock-S-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
smm-c-ccopts:=-D__SMM__
smm-S-ccopts:=-D__SMM__
@@ -292,7 +292,7 @@ $(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $
$(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H)
@printf " CC $(subst $(obj)/,,$(@))\n"
- $(CC) -MMD -D__BOOT_BLOCK__ $(CFLAGS) -c -o $@ $<
+ $(CC) -MMD $(bootblock-c-ccopts) $(CFLAGS) -c -o $@ $<
#######################################################################
# Clean up rules
OpenPOWER on IntegriCloud