GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Example how simple it is to use printk instead of printk_something in 

coreboot ram stage.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Peter Stuge <peter@stuge.se>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4450 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-07-21 21:25:45 +00:00 committed by Stefan Reinauer
parent 094198cf43
commit 0001a7f129
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/boot/hardwaremain.c
View File

@ -25,7 +25,6 @@ it with the version available from LANL.
* C Bootstrap code for the coreboot * C Bootstrap code for the coreboot
*/ */
#include <console/console.h> #include <console/console.h>
#include <version.h> #include <version.h>
#include <device/device.h> #include <device/device.h>
@ -62,7 +61,7 @@ void hardwaremain(int boot_complete)
post_code(0x39); post_code(0x39);
printk_notice("coreboot-%s%s %s %s...\n", printk(BIOS_NOTICE, "coreboot-%s%s %s %s...\n",
coreboot_version, coreboot_extra_version, coreboot_build, coreboot_version, coreboot_extra_version, coreboot_build,
(boot_complete)?"rebooting":"booting"); (boot_complete)?"rebooting":"booting");
@ -113,6 +112,6 @@ void hardwaremain(int boot_complete)
elfboot(lb_mem); elfboot(lb_mem);
#endif #endif
#endif #endif
printk_err("Boot failed.\n"); printk(BIOS_ERR, "Boot failed.\n");
} }

2
src/include/console/console.h
View File

@ -29,6 +29,8 @@ extern struct console_driver econsole_drivers[];
extern int console_loglevel; extern int console_loglevel;
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
#define printk(x...) do_printk(x)
#define printk_emerg(fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg) #define printk_emerg(fmt, arg...) do_printk(BIOS_EMERG ,fmt, ##arg)
#define printk_alert(fmt, arg...) do_printk(BIOS_ALERT ,fmt, ##arg) #define printk_alert(fmt, arg...) do_printk(BIOS_ALERT ,fmt, ##arg)
#define printk_crit(fmt, arg...) do_printk(BIOS_CRIT ,fmt, ##arg) #define printk_crit(fmt, arg...) do_printk(BIOS_CRIT ,fmt, ##arg)

3
src/include/x86emu/x86emu.h
View File

@ -49,7 +49,8 @@
/* FIXME: undefine printk for the moment */ /* FIXME: undefine printk for the moment */
#ifdef COREBOOT_VERSION #ifdef COREBOOT_VERSION
#include "console/console.h" #include "console/console.h"
#define printk printk_debug #undef printk
#define printk(x...) do_printk(BIOS_DEBUG, x)
#else #else
#define printk printf #define printk printf
#endif #endif