diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-18 12:41:16 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-20 07:28:37 +0100 |
| commit | c36af7b00a9854f626894e51fd28c9df6f1e4e43 (patch) | |
| tree | 90432ea5c8140d8882eecd5c63bedb1251d8da2b /src/console | |
| parent | 339064a0bfdaffb82ed407772b86826e98f77103 (diff) | |
Replace includes of build.h with version.h
As build.h is an auto-generated file it was necessary to add it as
an explicit prerequisite in the Makefiles. When this was forgotten
abuild would sometimes fail with following error:
fatal error: build.h: No such file or directory
Fix this error by compiling version.c into all stages.
Change-Id: I342f341077cc7496aed279b00baaa957aa2af0db
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7510
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/console/init.c | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index c72c60b309..d339500ea2 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -14,8 +14,3 @@ romstage-y += die.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c printk.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += init.c console.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c - -$(obj)/console/init.smm.o : $(obj)/build.h -$(obj)/console/init.ramstage.o : $(obj)/build.h -$(obj)/console/init.romstage.o : $(obj)/build.h -$(obj)/console/init.bootblock.o : $(obj)/build.h diff --git a/src/console/init.c b/src/console/init.c index 6d3dc1f68a..3dbf014919 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -19,12 +19,12 @@ * MA 02110-1301 USA */ -#include <build.h> #include <console/console.h> #include <console/uart.h> #include <console/streams.h> #include <device/pci.h> #include <option.h> +#include <version.h> /* While in romstage, console loglevel is built-time constant. */ static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; @@ -48,14 +48,7 @@ void console_init(void) console_hw_init(); #if defined(__PRE_RAM__) - static const char console_test[] = - "\n\ncoreboot-" - COREBOOT_VERSION - COREBOOT_EXTRA_VERSION - " " - COREBOOT_BUILD - " starting...\n"; - - print_info(console_test); + printk(BIOS_INFO, "\n\ncoreboot-%s%s %s starting...\n", + coreboot_version, coreboot_extra_version, coreboot_build); #endif } |