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

sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig 

Move this over to Kconfig and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-03-06 13:19:03 -07:00
parent a59abd1049
commit af28224546
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/sandbox_defconfig
View File

@ -41,3 +41,4 @@ CONFIG_UNIT_TEST=y
CONFIG_UT_TIME=y CONFIG_UT_TIME=y
CONFIG_UT_DM=y CONFIG_UT_DM=y
CONFIG_UT_ENV=y CONFIG_UT_ENV=y
CONFIG_SANDBOX_SERIAL=y

20
drivers/serial/Kconfig
View File

@ -76,6 +76,26 @@ config DEBUG_UART_SHIFT
value. Use this value to specify the shift to use, where 0=byte value. Use this value to specify the shift to use, where 0=byte
registers, 2=32-bit word registers, etc. registers, 2=32-bit word registers, etc.
config SANDBOX_SERIAL
bool "Sandbox UART support"
depends on SANDBOX && DM
help
Select this to enable a seral UART for sandbox. This is required to
operate correctly, otherwise you will see no serial output from
sandbox. The emulated UART will display to the console and console
input will be fed into the UART. This allows you to interact with
U-Boot.
The operation of the console is controlled by the -t command-line
flag. In raw mode, U-Boot sees all characters from the terminal
before they are processed, including Ctrl-C. In cooked mode, Ctrl-C
is processed by the terminal, and terminates U-Boot. Valid options
are:
-t raw-with-sigs Raw mode, Ctrl-C will terminate U-Boot
-t raw Raw mode, Ctrl-C is processed by U-Boot
-t cooked Cooked mode, Ctrl-C terminates
config UNIPHIER_SERIAL config UNIPHIER_SERIAL
bool "Support for UniPhier on-chip UART" bool "Support for UniPhier on-chip UART"
depends on ARCH_UNIPHIER && DM_SERIAL depends on ARCH_UNIPHIER && DM_SERIAL

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

@ -32,7 +32,7 @@ static void serial_find_console_or_panic(void)
struct udevice *dev; struct udevice *dev;
int node; int node;
if (OF_CONTROL) { if (OF_CONTROL && gd->fdt_blob) {
/* Check for a chosen console */ /* Check for a chosen console */
node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path"); node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
if (node < 0) if (node < 0)
@ -54,7 +54,8 @@ static void serial_find_console_or_panic(void)
return; return;
} }
} }
} else { }
if (!SPL_BUILD || !OF_CONTROL || !gd->fdt_blob) {
/* /*
* Try to use CONFIG_CONS_INDEX if available (it is numbered * Try to use CONFIG_CONS_INDEX if available (it is numbered
* from 1!). * from 1!).

1
include/configs/sandbox.h
View File

@ -113,7 +113,6 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200} 115200}
#define CONFIG_SANDBOX_SERIAL
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH

6
include/fdtdec.h
View File

@ -41,6 +41,12 @@ struct fdt_memory {
fdt_addr_t end; fdt_addr_t end;
}; };
#ifdef CONFIG_SPL_BUILD
#define SPL_BUILD 1
#else
#define SPL_BUILD 0
#endif
#ifdef CONFIG_OF_CONTROL #ifdef CONFIG_OF_CONTROL
# if defined(CONFIG_SPL_BUILD) && defined(SPL_DISABLE_OF_CONTROL) # if defined(CONFIG_SPL_BUILD) && defined(SPL_DISABLE_OF_CONTROL)
# define OF_CONTROL 0 # define OF_CONTROL 0