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

fix lots of warnings for cache as ram builds (trivial) 

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3467 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2008-08-03 10:35:06 +00:00 committed by Stefan Reinauer
parent 87c938f139
commit 912857ec6c
3 changed files with 62 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/i386/lib/console.c
View File

@ -13,9 +13,11 @@ static void __console_tx_byte(unsigned char byte)
#include "console_printk.c" #include "console_printk.c"
#if CONFIG_USE_INIT == 0
// do_printk // do_printk
#include "../../../console/vtxprintf.c" #include "../../../console/vtxprintf.c"
#include "printk_init.c" #include "printk_init.c"
#endif
#endif /* CONFIG_USE_PRINTK_IN_CAR */ #endif /* CONFIG_USE_PRINTK_IN_CAR */
@ -23,7 +25,6 @@ static void __console_tx_byte(unsigned char byte)
#define COREBOOT_EXTRA_VERSION "" #define COREBOOT_EXTRA_VERSION ""
#endif #endif
static void console_init(void) static void console_init(void)
{ {
static const char console_test[] = static const char console_test[] =

101
src/arch/i386/lib/console_print.c
View File

@ -58,58 +58,67 @@ static void __console_tx_string(int loglevel, const char *str)
} }
} }
#define NOINLINE __attribute__((noinline)) /* Actually this should say defined(__ROMCC__) but that define is explicitly
static void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); } * set in some auto.c files to trigger the simple device_t version to be used.
static void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); } * So __GNUCC__ does the right thing here.
static void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); } */
static void print_emerg_hex32(unsigned int value) { __console_tx_hex32(BIOS_EMERG, value); } #if defined (__GNUCC__)
static void print_emerg(const char *str) { __console_tx_string(BIOS_EMERG, str); } #define STATIC
#else
#define STATIC static
#endif
static void print_alert_char(unsigned char byte) { __console_tx_char(BIOS_ALERT, byte); } STATIC void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); }
static void print_alert_hex8(unsigned char value) { __console_tx_hex8(BIOS_ALERT, value); } STATIC void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); }
static void print_alert_hex16(unsigned short value){ __console_tx_hex16(BIOS_ALERT, value); } STATIC void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); }
static void print_alert_hex32(unsigned int value) { __console_tx_hex32(BIOS_ALERT, value); } STATIC void print_emerg_hex32(unsigned int value) { __console_tx_hex32(BIOS_EMERG, value); }
static void print_alert(const char *str) { __console_tx_string(BIOS_ALERT, str); } STATIC void print_emerg(const char *str) { __console_tx_string(BIOS_EMERG, str); }
static void print_crit_char(unsigned char byte) { __console_tx_char(BIOS_CRIT, byte); } STATIC void print_alert_char(unsigned char byte) { __console_tx_char(BIOS_ALERT, byte); }
static void print_crit_hex8(unsigned char value) { __console_tx_hex8(BIOS_CRIT, value); } STATIC void print_alert_hex8(unsigned char value) { __console_tx_hex8(BIOS_ALERT, value); }
static void print_crit_hex16(unsigned short value){ __console_tx_hex16(BIOS_CRIT, value); } STATIC void print_alert_hex16(unsigned short value){ __console_tx_hex16(BIOS_ALERT, value); }
static void print_crit_hex32(unsigned int value) { __console_tx_hex32(BIOS_CRIT, value); } STATIC void print_alert_hex32(unsigned int value) { __console_tx_hex32(BIOS_ALERT, value); }
static void print_crit(const char *str) { __console_tx_string(BIOS_CRIT, str); } STATIC void print_alert(const char *str) { __console_tx_string(BIOS_ALERT, str); }
static void print_err_char(unsigned char byte) { __console_tx_char(BIOS_ERR, byte); } STATIC void print_crit_char(unsigned char byte) { __console_tx_char(BIOS_CRIT, byte); }
static void print_err_hex8(unsigned char value) { __console_tx_hex8(BIOS_ERR, value); } STATIC void print_crit_hex8(unsigned char value) { __console_tx_hex8(BIOS_CRIT, value); }
static void print_err_hex16(unsigned short value){ __console_tx_hex16(BIOS_ERR, value); } STATIC void print_crit_hex16(unsigned short value){ __console_tx_hex16(BIOS_CRIT, value); }
static void print_err_hex32(unsigned int value) { __console_tx_hex32(BIOS_ERR, value); } STATIC void print_crit_hex32(unsigned int value) { __console_tx_hex32(BIOS_CRIT, value); }
static void print_err(const char *str) { __console_tx_string(BIOS_ERR, str); } STATIC void print_crit(const char *str) { __console_tx_string(BIOS_CRIT, str); }
static void print_warning_char(unsigned char byte) { __console_tx_char(BIOS_WARNING, byte); } STATIC void print_err_char(unsigned char byte) { __console_tx_char(BIOS_ERR, byte); }
static void print_warning_hex8(unsigned char value) { __console_tx_hex8(BIOS_WARNING, value); } STATIC void print_err_hex8(unsigned char value) { __console_tx_hex8(BIOS_ERR, value); }
static void print_warning_hex16(unsigned short value){ __console_tx_hex16(BIOS_WARNING, value); } STATIC void print_err_hex16(unsigned short value){ __console_tx_hex16(BIOS_ERR, value); }
static void print_warning_hex32(unsigned int value) { __console_tx_hex32(BIOS_WARNING, value); } STATIC void print_err_hex32(unsigned int value) { __console_tx_hex32(BIOS_ERR, value); }
static void print_warning(const char *str) { __console_tx_string(BIOS_WARNING, str); } STATIC void print_err(const char *str) { __console_tx_string(BIOS_ERR, str); }
static void print_notice_char(unsigned char byte) { __console_tx_char(BIOS_NOTICE, byte); } STATIC void print_warning_char(unsigned char byte) { __console_tx_char(BIOS_WARNING, byte); }
static void print_notice_hex8(unsigned char value) { __console_tx_hex8(BIOS_NOTICE, value); } STATIC void print_warning_hex8(unsigned char value) { __console_tx_hex8(BIOS_WARNING, value); }
static void print_notice_hex16(unsigned short value){ __console_tx_hex16(BIOS_NOTICE, value); } STATIC void print_warning_hex16(unsigned short value){ __console_tx_hex16(BIOS_WARNING, value); }
static void print_notice_hex32(unsigned int value) { __console_tx_hex32(BIOS_NOTICE, value); } STATIC void print_warning_hex32(unsigned int value) { __console_tx_hex32(BIOS_WARNING, value); }
static void print_notice(const char *str) { __console_tx_string(BIOS_NOTICE, str); } STATIC void print_warning(const char *str) { __console_tx_string(BIOS_WARNING, str); }
static void print_info_char(unsigned char byte) { __console_tx_char(BIOS_INFO, byte); } STATIC void print_notice_char(unsigned char byte) { __console_tx_char(BIOS_NOTICE, byte); }
static void print_info_hex8(unsigned char value) { __console_tx_hex8(BIOS_INFO, value); } STATIC void print_notice_hex8(unsigned char value) { __console_tx_hex8(BIOS_NOTICE, value); }
static void print_info_hex16(unsigned short value){ __console_tx_hex16(BIOS_INFO, value); } STATIC void print_notice_hex16(unsigned short value){ __console_tx_hex16(BIOS_NOTICE, value); }
static void print_info_hex32(unsigned int value) { __console_tx_hex32(BIOS_INFO, value); } STATIC void print_notice_hex32(unsigned int value) { __console_tx_hex32(BIOS_NOTICE, value); }
static void print_info(const char *str) { __console_tx_string(BIOS_INFO, str); } STATIC void print_notice(const char *str) { __console_tx_string(BIOS_NOTICE, str); }
static void print_debug_char(unsigned char byte) { __console_tx_char(BIOS_DEBUG, byte); } STATIC void print_info_char(unsigned char byte) { __console_tx_char(BIOS_INFO, byte); }
static void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG, value); } STATIC void print_info_hex8(unsigned char value) { __console_tx_hex8(BIOS_INFO, value); }
static void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); } STATIC void print_info_hex16(unsigned short value){ __console_tx_hex16(BIOS_INFO, value); }
static void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); } STATIC void print_info_hex32(unsigned int value) { __console_tx_hex32(BIOS_INFO, value); }
static void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); } STATIC void print_info(const char *str) { __console_tx_string(BIOS_INFO, str); }
static void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); } STATIC void print_debug_char(unsigned char byte) { __console_tx_char(BIOS_DEBUG, byte); }
static void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); } STATIC void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG, value); }
static void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW, value); } STATIC void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); }
static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); } STATIC void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); }
static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); } STATIC void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); }
STATIC void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); }
STATIC void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); }
STATIC void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW, value); }
STATIC void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); }
STATIC void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }

5
src/pc80/serial.c
View File

@ -91,8 +91,13 @@ static void uart_init(void)
#endif #endif
outb(UART_LCS, TTYS0_BASE + UART_LCR); outb(UART_LCS, TTYS0_BASE + UART_LCR);
} }
#else #else
/* CONFIG_USE_PRINTK_IN_CAR == 1 */
#if CONFIG_USE_INIT == 0
#include "../lib/uart8250.c" #include "../lib/uart8250.c"
#endif
extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs); extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
static void uart_init(void) static void uart_init(void)
{ {