mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-28 23:23:30 +08:00
98ab435f73
This patch builds upon the recently introduced CBMEM console feature of coreboot. CBMEM console uses a memry area allocated by coreboot to store the console output. The memory area has a certain structure, which allows to determine where the buffer is, the buffer size and the location of the pointer in the buffer. This allows different phases of the firmware (rom based coreboot, ram based coreboot, u-boot after relocation with this change) to keep adding text to the same buffer. Note that this patch introduces a new console driver and adds the driver to the list of drivers to be used for console output, i.e. it engages only after u-boot relocates. Usiong CBMEM console for capturing the pre-relocation console output will be done under a separate change. >From Linux, run the cbmem.py utility (which is a part of the coreboot package) to see the output, e.g.: vvvvvvvvvvvvvvvvv SCSI: AHCI 0001.0300 32 slots 6 ports ? Gbps 0xf impl SATA mode flags: 64bit ilck stag led pmp pio ... Magic signature found Kernel command line: "cros_secure quiet loglevel=1 console=tty2... ^^^^^^^^^^^^^^^^^ Note that the entire u-boot output fits into the buffer only if the coreboot log level is reduced from the most verbose. Ether the buffer size will have to be increased, or the coreboot verbosity permanently reduced. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
245 lines
5.4 KiB
C
245 lines
5.4 KiB
C
/*
|
|
* (C) Copyright 2000
|
|
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
|
|
*
|
|
* 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 <config.h>
|
|
#include <common.h>
|
|
#include <stdarg.h>
|
|
#include <malloc.h>
|
|
#include <stdio_dev.h>
|
|
#include <serial.h>
|
|
#ifdef CONFIG_LOGBUFFER
|
|
#include <logbuff.h>
|
|
#endif
|
|
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
|
|
#include <i2c.h>
|
|
#endif
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
static struct stdio_dev devs;
|
|
struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL };
|
|
char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
|
|
|
|
#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
|
|
#define CONFIG_SYS_DEVICE_NULLDEV 1
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_SYS_DEVICE_NULLDEV
|
|
void nulldev_putc(const char c)
|
|
{
|
|
/* nulldev is empty! */
|
|
}
|
|
|
|
void nulldev_puts(const char *s)
|
|
{
|
|
/* nulldev is empty! */
|
|
}
|
|
|
|
int nulldev_input(void)
|
|
{
|
|
/* nulldev is empty! */
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
/**************************************************************************
|
|
* SYSTEM DRIVERS
|
|
**************************************************************************
|
|
*/
|
|
|
|
static void drv_system_init (void)
|
|
{
|
|
struct stdio_dev dev;
|
|
|
|
memset (&dev, 0, sizeof (dev));
|
|
|
|
strcpy (dev.name, "serial");
|
|
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
|
|
dev.putc = serial_putc;
|
|
dev.puts = serial_puts;
|
|
dev.getc = serial_getc;
|
|
dev.tstc = serial_tstc;
|
|
stdio_register (&dev);
|
|
|
|
#ifdef CONFIG_SYS_DEVICE_NULLDEV
|
|
memset (&dev, 0, sizeof (dev));
|
|
|
|
strcpy (dev.name, "nulldev");
|
|
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
|
|
dev.putc = nulldev_putc;
|
|
dev.puts = nulldev_puts;
|
|
dev.getc = nulldev_input;
|
|
dev.tstc = nulldev_input;
|
|
|
|
stdio_register (&dev);
|
|
#endif
|
|
}
|
|
|
|
/**************************************************************************
|
|
* DEVICES
|
|
**************************************************************************
|
|
*/
|
|
struct list_head* stdio_get_list(void)
|
|
{
|
|
return &(devs.list);
|
|
}
|
|
|
|
struct stdio_dev* stdio_get_by_name(const char *name)
|
|
{
|
|
struct list_head *pos;
|
|
struct stdio_dev *dev;
|
|
|
|
if(!name)
|
|
return NULL;
|
|
|
|
list_for_each(pos, &(devs.list)) {
|
|
dev = list_entry(pos, struct stdio_dev, list);
|
|
if(strcmp(dev->name, name) == 0)
|
|
return dev;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
struct stdio_dev* stdio_clone(struct stdio_dev *dev)
|
|
{
|
|
struct stdio_dev *_dev;
|
|
|
|
if(!dev)
|
|
return NULL;
|
|
|
|
_dev = calloc(1, sizeof(struct stdio_dev));
|
|
|
|
if(!_dev)
|
|
return NULL;
|
|
|
|
memcpy(_dev, dev, sizeof(struct stdio_dev));
|
|
strncpy(_dev->name, dev->name, 16);
|
|
|
|
return _dev;
|
|
}
|
|
|
|
int stdio_register (struct stdio_dev * dev)
|
|
{
|
|
struct stdio_dev *_dev;
|
|
|
|
_dev = stdio_clone(dev);
|
|
if(!_dev)
|
|
return -1;
|
|
list_add_tail(&(_dev->list), &(devs.list));
|
|
return 0;
|
|
}
|
|
|
|
/* deregister the device "devname".
|
|
* returns 0 if success, -1 if device is assigned and 1 if devname not found
|
|
*/
|
|
#ifdef CONFIG_SYS_STDIO_DEREGISTER
|
|
int stdio_deregister(const char *devname)
|
|
{
|
|
int l;
|
|
struct list_head *pos;
|
|
struct stdio_dev *dev;
|
|
char temp_names[3][16];
|
|
|
|
dev = stdio_get_by_name(devname);
|
|
|
|
if(!dev) /* device not found */
|
|
return -1;
|
|
/* get stdio devices (ListRemoveItem changes the dev list) */
|
|
for (l=0 ; l< MAX_FILES; l++) {
|
|
if (stdio_devices[l] == dev) {
|
|
/* Device is assigned -> report error */
|
|
return -1;
|
|
}
|
|
memcpy (&temp_names[l][0],
|
|
stdio_devices[l]->name,
|
|
sizeof(temp_names[l]));
|
|
}
|
|
|
|
list_del(&(dev->list));
|
|
|
|
/* reassign Device list */
|
|
list_for_each(pos, &(devs.list)) {
|
|
dev = list_entry(pos, struct stdio_dev, list);
|
|
for (l=0 ; l< MAX_FILES; l++) {
|
|
if(strcmp(dev->name, temp_names[l]) == 0)
|
|
stdio_devices[l] = dev;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_SYS_STDIO_DEREGISTER */
|
|
|
|
int stdio_init (void)
|
|
{
|
|
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
|
|
/* already relocated for current ARM implementation */
|
|
ulong relocation_offset = gd->reloc_off;
|
|
int i;
|
|
|
|
/* relocate device name pointers */
|
|
for (i = 0; i < (sizeof (stdio_names) / sizeof (char *)); ++i) {
|
|
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
|
|
relocation_offset);
|
|
}
|
|
#endif /* CONFIG_NEEDS_MANUAL_RELOC */
|
|
|
|
/* Initialize the list */
|
|
INIT_LIST_HEAD(&(devs.list));
|
|
|
|
#ifdef CONFIG_ARM_DCC_MULTI
|
|
drv_arm_dcc_init ();
|
|
#endif
|
|
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
|
|
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
|
#endif
|
|
#ifdef CONFIG_LCD
|
|
drv_lcd_init ();
|
|
#endif
|
|
#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
|
|
drv_video_init ();
|
|
#endif
|
|
#ifdef CONFIG_KEYBOARD
|
|
drv_keyboard_init ();
|
|
#endif
|
|
#ifdef CONFIG_LOGBUFFER
|
|
drv_logbuff_init ();
|
|
#endif
|
|
drv_system_init ();
|
|
serial_stdio_init ();
|
|
#ifdef CONFIG_USB_TTY
|
|
drv_usbtty_init ();
|
|
#endif
|
|
#ifdef CONFIG_NETCONSOLE
|
|
drv_nc_init ();
|
|
#endif
|
|
#ifdef CONFIG_JTAG_CONSOLE
|
|
drv_jtag_console_init ();
|
|
#endif
|
|
#ifdef CONFIG_CBMEM_CONSOLE
|
|
cbmemc_init();
|
|
#endif
|
|
return (0);
|
|
}
|