separate build.h and config.h usage (now possible because newconfig is gone)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> This patch is slightly reworked to include a necessary romcc change that allows more than one -include specified on the command line, and gets rid of the explicit build.h dependencies of all files. (The files do keep an explicit config.h dependency though) git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5114 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Stefan Reinauer
parent
e82f4754ee
commit
b4d3af8888
@@ -79,11 +79,11 @@ $(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib
|
||||
$(obj)/romcc $(ROMCCFLAGS) --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h
|
||||
$(obj)/romcc $(ROMCCFLAGS) $(INCLUDES) $< -o $@
|
||||
$(obj)/romcc $(ROMCCFLAGS) -include $(obj)/build.h $(INCLUDES) $< -o $@
|
||||
|
||||
else
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
|
||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp
|
||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o - | sed -e 's/\.rodata/.rom.data/g' -e 's/\.text/.section .rom.text/g' > $@.tmp
|
||||
mv $@.tmp $@
|
||||
endif
|
||||
endif
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <build.h>
|
||||
#include <console/loglevel.h>
|
||||
|
||||
#if CONFIG_USE_PRINTK_IN_CAR == 0
|
||||
@@ -6,10 +7,6 @@
|
||||
#include "console_printk.c"
|
||||
#endif /* CONFIG_USE_PRINTK_IN_CAR */
|
||||
|
||||
#ifndef COREBOOT_EXTRA_VERSION
|
||||
#define COREBOOT_EXTRA_VERSION ""
|
||||
#endif
|
||||
|
||||
void console_init(void)
|
||||
{
|
||||
static const char console_test[] =
|
||||
@@ -22,7 +19,6 @@ void console_init(void)
|
||||
print_info(console_test);
|
||||
}
|
||||
|
||||
|
||||
void die(const char *str)
|
||||
{
|
||||
print_emerg(str);
|
||||
|
@@ -1,4 +1,5 @@
|
||||
#include <version.h>
|
||||
#include <build.h>
|
||||
|
||||
#ifndef CONFIG_MAINBOARD_VENDOR
|
||||
#error CONFIG_MAINBOARD_VENDOR not defined
|
||||
|
Reference in New Issue
Block a user