u-boot.git/common, branch v2016.11-rc3

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

2016-10-28T15:12:03+00:00

Signed-off-by: Tom Rini 

Conflicts:
	common/Kconfig
	configs/dms-ba16_defconfig

config: Move CONFIG_DEFAULT_FDT_FILE to defconfigs

2016-10-26T14:53:16+00:00

- Add DEFAULT_FDT_FILE kconfig entry
- Move CONFIG_DEFAULT_FDT_FILE from include/configs to defconfigs

Cc: Tom Rini 
Cc: Simon Glass 
Cc: Michael Trimarchi 
Signed-off-by: Jagan Teki

Convert CONFIG_SYS_STDIO_DEREGISTER to Kconfig

2016-10-23T22:34:17+00:00

This converts the following to Kconfig:
   CONFIG_SYS_STDIO_DEREGISTER

This option should never be enabled in SPL, so use
CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option.

Signed-off-by: Simon Glass 
[trini: Re-sync]
Signed-off-by: Tom Rini

Convert CONFIG_SYS_CONSOLE_INFO_QUIET to Kconfig

2016-10-23T22:34:12+00:00

This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_INFO_QUIET

Signed-off-by: Simon Glass 
[trini: Make this default n, re-run the migration]
Signed-off-by: Tom Rini

Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to Kconfig

2016-10-23T22:34:01+00:00

This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to Kconfig

2016-10-23T22:33:58+00:00

This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_ENV_OVERWRITE

Signed-off-by: Simon Glass 
Reviewed-by: Tom Rini

Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig

2016-10-23T22:33:35+00:00

This converts the following to Kconfig:
   CONFIG_SYS_CONSOLE_IS_IN_ENV
   CONFIG_CONSOLE_MUX

Signed-off-by: Simon Glass 
[trini: Re-order, re-migrate]
Signed-off-by: Tom Rini

Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig

2016-10-23T22:33:19+00:00

Move these option to Kconfig and tidy up existing uses.

Signed-off-by: Simon Glass 
Reviewed-by: Jagan Teki

Convert SILENT_CONSOLE options to Kconfig

2016-10-23T22:33:18+00:00

Move these option to Kconfig and tidy up existing uses.

The Power PC boards don't have a suitable common element: the common header
files don't appear to line up with the Kconfig files as far as I can tell.
This results in a lot of defconfig changes.

Signed-off-by: Simon Glass 
Reviewed-by: Jagan Teki 
[trini: Re-migrate, update common/console.c logic]
Signed-off-by: Tom Rini

watchdog: Fix Watchdog Reset while in U-Boot Prompt

2016-10-18T01:31:01+00:00

Hardware: CM-FX6 Module from Compulab

This patch fixes unwanted watchdog resets while the user enters
a command at the U-Boot prompt.

As found on the CM-FX6 board from Compulab, when having enabled the
watchdog, a missing WATCHDOG_RESET call in common/console.c causes
this and alike boards to reset when the watchdog's timeout has
elapsed while waiting at the U-Boot prompt.

Despite the user could press several keys within the watchdog
timeout limit, the while loop in cli_readline.c, line 261, does only
call WATCHDOG_RESET if first == 1, which gets set to 0 in the 1st
loop iteration. This leads to a watchdog timeout no matter if the
user presses keys or not.

Although, this affects other boards as well as it touches
common/console.c, the macro WATCHDOG_RESET expands to {} if watchdog
support isn't configured. Hence, there's no harm caused and no need to
surround it by #ifdef in this case.

 * Symptom:
   U-Boot resets after watchdog times out when in commandline prompt
   and watchdog is enabled.

 * Reasoning:
   When U-Boot shows the commandline prompt, the following function
   call stack is executed while waiting for a keypress:

   common/main.c:
                    main_loop          => common/cli.c: cli_loop() =>
   common/cli_hush.c:
                    parse_file_outer   => parse_stream_outer       =>
                    parse_stream       => b_getch(i)               =>
                    i->get(i)          => file_get                 =>
                    get_user_input     => cmdedit_read_input       =>
                    uboot_cli_readline =>
   common/cli_readline.c:
                    cli_readline       => cli_readline_into_buffer =>
                    cread_line         => getcmd_getch (== getc)   =>
   common/console.c:
                    fgetc              => console_tstc

   common/console.c:
   (with CONFIG_CONSOLE_MUX is set)

   - in console_tstc line 181:
   If dev->tstc(dev) returns 0, the global tstcdev variable doesn't get
   set. This is the case if no character is in the serial buffer.

   - in fgetc(int file), line 297:
   Program flow keeps looping because tstcdev does not get set.
   Therefore WATCHDOG_RESET is not called, as mx_serial_tstc from
   drivers/serial/serial_mxc.c does not call it.

 * Solution:
   Add WATCHDOG_RESET into the loop of console_tstc.

   Note: Macro expands to {} if not configured, so no #ifdef is needed.

 * Comment:

Signed-off-by: Christian Storm 
Signed-off-by: Jan Kiszka 
Signed-off-by: Andreas J. Reichel 
Acked-by: Simon Glass