V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: serial: Don't support CONFIG_CONS_INDEX with device tree 

This feature should be deprecated for new boards, and significantly adds
to SPL code size. Drop it. Instead, we can use stdout-path in the /chosen
node.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-05-12 14:55:05 -06:00
parent 47a785a9dd
commit e9fc058314
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/serial/serial-uclass.c
View File

@ -30,49 +30,54 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
static void serial_find_console_or_panic(void) static void serial_find_console_or_panic(void)
{ {
struct udevice *dev; struct udevice *dev;
#ifdef CONFIG_OF_CONTROL
int node; int node;
/* Check for a chosen console */ if (OF_CONTROL) {
node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path"); /* Check for a chosen console */
if (node < 0) node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
node = fdt_path_offset(gd->fdt_blob, "console"); if (node < 0)
if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, &dev)) { node = fdt_path_offset(gd->fdt_blob, "console");
gd->cur_serial_dev = dev; if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node,
return; &dev)) {
}
/*
* If the console is not marked to be bound before relocation, bind
* it anyway.
*/
if (node > 0 &&
!lists_bind_fdt(gd->dm_root, gd->fdt_blob, node, &dev)) {
if (!device_probe(dev)) {
gd->cur_serial_dev = dev; gd->cur_serial_dev = dev;
return; return;
} }
}
#endif /*
/* * If the console is not marked to be bound before relocation,
* Try to use CONFIG_CONS_INDEX if available (it is numbered from 1!). * bind it anyway.
* */
* Failing that, get the device with sequence number 0, or in extremis if (node > 0 &&
* just the first serial device we can find. But we insist on having !lists_bind_fdt(gd->dm_root, gd->fdt_blob, node, &dev)) {
* a console (even if it is silent). if (!device_probe(dev)) {
*/ gd->cur_serial_dev = dev;
return;
}
}
} else {
/*
* Try to use CONFIG_CONS_INDEX if available (it is numbered
* from 1!).
*
* Failing that, get the device with sequence number 0, or in
* extremis just the first serial device we can find. But we
* insist on having a console (even if it is silent).
*/
#ifdef CONFIG_CONS_INDEX #ifdef CONFIG_CONS_INDEX
#define INDEX (CONFIG_CONS_INDEX - 1) #define INDEX (CONFIG_CONS_INDEX - 1)
#else #else
#define INDEX 0 #define INDEX 0
#endif #endif
if (uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) && if (!uclass_get_device_by_seq(UCLASS_SERIAL, INDEX, &dev) ||
uclass_get_device(UCLASS_SERIAL, INDEX, &dev) && !uclass_get_device(UCLASS_SERIAL, INDEX, &dev) ||
(uclass_first_device(UCLASS_SERIAL, &dev) || !dev)) (!uclass_first_device(UCLASS_SERIAL, &dev) || dev)) {
panic_str("No serial driver found"); gd->cur_serial_dev = dev;
return;
}
#undef INDEX #undef INDEX
gd->cur_serial_dev = dev; }
panic_str("No serial driver found");
} }
/* Called prior to relocation */ /* Called prior to relocation */