lp:u-boot

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

16009. By Tom Rini <email address hidden> on 2016-10-19

Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

Patch queue for efi - 2016-10-19

Highlights this time around:

  - Add run time service (power control) support for PSCI (fixed in v3)
  - Add efi gop pointer exposure
  - SMBIOS support for EFI (on ARM)
  - efi pool memory unmap support (needed for 4.8)
  - initial x86 efi payload support (fixed up in v2)
  - various bug fixes

Signed-off-by: Tom Rini <email address hidden>

Conflicts:
 include/tables_csum.h

16008. By Tom Rini <email address hidden> on 2016-10-18

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

16007. By Tom Rini <email address hidden> on 2016-10-18

Merge git://git.denx.de/u-boot-x86

16006. By Andreas J. Reichel <email address hidden> on 2016-10-18

watchdog: Fix Watchdog Reset while in U-Boot Prompt

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 <email address hidden>
Signed-off-by: Jan Kiszka <email address hidden>
Signed-off-by: Andreas J. Reichel <email address hidden>
Acked-by: Simon Glass <email address hidden>

16005. By Tom Rini <email address hidden> on 2016-10-18

Prepare v2016.11-rc2

Signed-off-by: Tom Rini <email address hidden>

16004. By Tom Rini <email address hidden> on 2016-10-15

Merge git://git.denx.de/u-boot-mpc85xx

16003. By Heiko Schocher on 2016-10-15

spl: move FDT_FIXUP_PARTITIONS to Kconfig

Move FDT_FIXUP_PARTITIONS to Kconfig and cleanup existing
uses.

Signed-off-by: Heiko Schocher <email address hidden>

16002. By Heiko Schocher on 2016-10-15

spl: move SYS_OS_BASE to Kconfig

Move SYS_OS_BASE to Kconfig and cleanup existing
uses.

Signed-off-by: Heiko Schocher <email address hidden>
[trini: Also migrate a4m2k]
Signed-off-by: Tom Rini <email address hidden>

16001. By Heiko Schocher on 2016-10-15

spl: move SPL_OS_BOOT to Kconfig

Move SPL_OS_BOOT to Kconfig and cleanup existing
uses.

Signed-off-by: Heiko Schocher <email address hidden>

16000. By Tom Rini <email address hidden> on 2016-10-14

test/py/tests/test_sleep.py: Add check for CONFIG_CMD_MISC

We can only run this command if the sleep command is enabled and that
depends on CONFIG_CMD_MISC

Signed-off-by: Tom Rini <email address hidden>