libpayload: Add support for the CBMEM in memory console.

Change-Id: I1489b5306ef1ca078686fed4dba2d242f70ad941
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://review.coreboot.org/1727
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Gabe Black 2012-09-29 00:21:27 -07:00 committed by Stefan Reinauer
parent 87abeff334
commit a54b6a6143
6 changed files with 72 additions and 0 deletions

View File

@ -147,6 +147,10 @@ endmenu
menu "Console Options"
config CBMEM_CONSOLE
bool "Send output to the in memory CBMEM console"
default y
config SERIAL_CONSOLE
bool "See output on the serial port console"
default y

View File

@ -32,6 +32,7 @@ CONFIG_LZMA=y
#
# Console Options
#
CONFIG_CBMEM_CONSOLE=y
CONFIG_SERIAL_CONSOLE=y
CONFIG_SERIAL_IOBASE=0x3f8
# CONFIG_SERIAL_SET_SPEED is not set

View File

@ -37,6 +37,8 @@ libc-$(CONFIG_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
libc-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.c
libc-$(CONFIG_NVRAM) += nvram.c
libc-$(CONFIG_NVRAM) += options.c

View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2012 The Chromium OS Authors.
*
* See file CREDITS for list of people who contributed to this
* 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; either version 2 of
* the License, or (at your option) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <libpayload.h>
#include <stdint.h>
struct cbmem_console {
uint32_t size;
uint32_t cursor;
uint8_t body[0];
} __attribute__ ((__packed__));
static struct cbmem_console *cbmem_console_p;
static struct console_output_driver cbmem_console_driver =
{
.putchar = &cbmem_console_putc
};
void cbmem_console_init(void)
{
cbmem_console_p = lib_sysinfo.cbmem_cons;
if (cbmem_console_p)
console_add_output_driver(&cbmem_console_driver);
}
void cbmem_console_putc(unsigned int data)
{
// Bail out if the buffer is full.
if (cbmem_console_p->cursor >= cbmem_console_p->size)
return;
cbmem_console_p->body[cbmem_console_p->cursor++] = data;
}

View File

@ -201,6 +201,15 @@ void video_console_get_cursor(unsigned int *x, unsigned int *y, unsigned int *en
void video_console_set_cursor(unsigned int cursorx, unsigned int cursory);
/** @} */
/**
* @defgroup cbmem_console CBMEM memory console.
* @ingroup input
* @{
*/
void cbmem_console_init(void);
void cbmem_console_putc(unsigned int data);
/** @} */
/* drivers/option.c */
struct nvram_accessor {
u8 (*read)(u8 reg);

View File

@ -57,6 +57,9 @@ void console_init(void)
#ifdef CONFIG_PC_KEYBOARD
keyboard_init();
#endif
#ifdef CONFIG_CBMEM_CONSOLE
cbmem_console_init();
#endif
}
static void device_putchar(unsigned char c)