arch/x86: Drop leftover ROMCC console support
Change-Id: I3e52569a34e1f7bfea8be9da91348c364ab705e1 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/26817 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
committed by
Martin Roth
parent
5ad79cdf2f
commit
c8cf591ee8
@@ -1,100 +0,0 @@
|
||||
/*
|
||||
* This file is part of the coreboot project.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef __CONSOLE_EARLY_PRINT_H_
|
||||
#define __CONSOLE_EARLY_PRINT_H_
|
||||
|
||||
#if !defined(__ROMCC__)
|
||||
#error "Don't include early_print.h"
|
||||
#endif
|
||||
|
||||
#include <console/console.h>
|
||||
#include <console/streams.h>
|
||||
#include <commonlib/loglevel.h>
|
||||
|
||||
/* While in romstage, console loglevel is built-time constant.
|
||||
* With ROMCC we inline this test with help from preprocessor.
|
||||
*/
|
||||
#define console_log_level(msg_level) \
|
||||
(msg_level <= CONFIG_DEFAULT_CONSOLE_LOGLEVEL)
|
||||
|
||||
#define CALL_CONSOLE_TX(loglevel, tx_func, x) \
|
||||
do { \
|
||||
if (console_log_level(loglevel)) { \
|
||||
tx_func(x); \
|
||||
console_tx_flush(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define __console_tx_char(level, x) \
|
||||
CALL_CONSOLE_TX(level, console_tx_byte, x)
|
||||
#define __console_tx_hex8(level, x) \
|
||||
CALL_CONSOLE_TX(level, console_tx_hex8, x)
|
||||
#define __console_tx_hex16(level, x) \
|
||||
CALL_CONSOLE_TX(level, console_tx_hex16, x)
|
||||
#define __console_tx_hex32(level, x) \
|
||||
CALL_CONSOLE_TX(level, console_tx_hex32, x)
|
||||
#define __console_tx_string(level, x) \
|
||||
CALL_CONSOLE_TX(level, console_tx_string, x)
|
||||
|
||||
#define print_emerg(STR) __console_tx_string(BIOS_EMERG, STR)
|
||||
#define print_alert(STR) __console_tx_string(BIOS_ALERT, STR)
|
||||
#define print_crit(STR) __console_tx_string(BIOS_CRIT, STR)
|
||||
#define print_err(STR) __console_tx_string(BIOS_ERR, STR)
|
||||
#define print_warning(STR) __console_tx_string(BIOS_WARNING, STR)
|
||||
#define print_notice(STR) __console_tx_string(BIOS_NOTICE, STR)
|
||||
#define print_info(STR) __console_tx_string(BIOS_INFO, STR)
|
||||
#define print_debug(STR) __console_tx_string(BIOS_DEBUG, STR)
|
||||
#define print_spew(STR) __console_tx_string(BIOS_SPEW, STR)
|
||||
|
||||
#define print_emerg_char(CH) __console_tx_char(BIOS_EMERG, CH)
|
||||
#define print_alert_char(CH) __console_tx_char(BIOS_ALERT, CH)
|
||||
#define print_crit_char(CH) __console_tx_char(BIOS_CRIT, CH)
|
||||
#define print_err_char(CH) __console_tx_char(BIOS_ERR, CH)
|
||||
#define print_warning_char(CH) __console_tx_char(BIOS_WARNING, CH)
|
||||
#define print_notice_char(CH) __console_tx_char(BIOS_NOTICE, CH)
|
||||
#define print_info_char(CH) __console_tx_char(BIOS_INFO, CH)
|
||||
#define print_debug_char(CH) __console_tx_char(BIOS_DEBUG, CH)
|
||||
#define print_spew_char(CH) __console_tx_char(BIOS_SPEW, CH)
|
||||
|
||||
#define print_emerg_hex8(HEX) __console_tx_hex8(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex8(HEX) __console_tx_hex8(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex8(HEX) __console_tx_hex8(BIOS_CRIT, HEX)
|
||||
#define print_err_hex8(HEX) __console_tx_hex8(BIOS_ERR, HEX)
|
||||
#define print_warning_hex8(HEX) __console_tx_hex8(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex8(HEX) __console_tx_hex8(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex8(HEX) __console_tx_hex8(BIOS_INFO, HEX)
|
||||
#define print_debug_hex8(HEX) __console_tx_hex8(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex8(HEX) __console_tx_hex8(BIOS_SPEW, HEX)
|
||||
|
||||
#define print_emerg_hex16(HEX) __console_tx_hex16(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex16(HEX) __console_tx_hex16(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex16(HEX) __console_tx_hex16(BIOS_CRIT, HEX)
|
||||
#define print_err_hex16(HEX) __console_tx_hex16(BIOS_ERR, HEX)
|
||||
#define print_warning_hex16(HEX) __console_tx_hex16(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex16(HEX) __console_tx_hex16(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex16(HEX) __console_tx_hex16(BIOS_INFO, HEX)
|
||||
#define print_debug_hex16(HEX) __console_tx_hex16(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex16(HEX) __console_tx_hex16(BIOS_SPEW, HEX)
|
||||
|
||||
#define print_emerg_hex32(HEX) __console_tx_hex32(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex32(HEX) __console_tx_hex32(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex32(HEX) __console_tx_hex32(BIOS_CRIT, HEX)
|
||||
#define print_err_hex32(HEX) __console_tx_hex32(BIOS_ERR, HEX)
|
||||
#define print_warning_hex32(HEX) __console_tx_hex32(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex32(HEX) __console_tx_hex32(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex32(HEX) __console_tx_hex32(BIOS_INFO, HEX)
|
||||
#define print_debug_hex32(HEX) __console_tx_hex32(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex32(HEX) __console_tx_hex32(BIOS_SPEW, HEX)
|
||||
|
||||
#endif /* __CONSOLE_EARLY_PRINT_H_ */
|
@@ -23,10 +23,6 @@ void ne2k_append_data(unsigned char *d, int len, unsigned int base);
|
||||
int ne2k_init(unsigned int eth_nic_base);
|
||||
void ne2k_transmit(unsigned int eth_nic_base);
|
||||
|
||||
#ifndef __ROMCC__
|
||||
#define ne2k_append_data_byte(d, base) ne2k_append_data(&d, 1, base)
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_CONSOLE_NE2K) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
static inline void __ne2k_init(void)
|
||||
{
|
||||
@@ -34,7 +30,7 @@ static inline void __ne2k_init(void)
|
||||
}
|
||||
static inline void __ne2k_tx_byte(u8 data)
|
||||
{
|
||||
ne2k_append_data_byte(data, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
ne2k_append_data(&data, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
}
|
||||
static inline void __ne2k_tx_flush(void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user