u-boot.git, branch v2016.07-rc3

Prepare v2016.07-rc3

2016-07-01T21:43:17+00:00

Signed-off-by: Tom Rini

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

2016-07-01T21:43:06+00:00

mmc: increase MMC SDHCI read status timeout

2016-07-01T21:42:57+00:00

Otherwise,  ocassionally see errors like this:
  Flashing sparse image at offset 2078720
  Flashing Sparse Image
  sdhci_send_command: Timeout for status update!
  mmc fail to send stop cmd
  write_sparse_image: Write failed, block #2181088 [0]

This does not affect the actual writing speed, which is controlled by
the default value:
  CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT

It only increases the retries when reading:
  SDHCI_INT_STATUS
to avoid the timeout error.

Signed-off-by: Steve Rae 
Reviewed-by: Stefan Roese 
Tested-by: Masahiro Yamada 
Tested-by: Jaehoon Chung

ti_omap5_common: Find right dtb file for DRA72-RevC Evm

2016-07-01T21:42:57+00:00

DRA72-Evm revC uses dra72-evm-revc.dtb. Update the same in env vatiables.

Signed-off-by: Lokesh Vutla

autoboot: move bootdelay >= 0 check to abortboot()

2016-07-01T21:42:56+00:00

Move the bootdelay >= 0 check to the caller, which simplifies
the callees.

Signed-off-by: Masahiro Yamada 
Reviewed-by: Stefan Roese 
Reviewed-by: Simon Glass 
Reviewed-by: Heiko Schocher

autoboot: move CONFIG_SILENT_CONSOLE handling

2016-07-01T21:42:56+00:00

Factor out the same code from the callees to the caller.

Signed-off-by: Masahiro Yamada 
Reviewed-by: Stefan Roese 
Reviewed-by: Simon Glass 
Reviewed-by: Heiko Schocher

autoboot: rename abortboot_{keyed, normal} to __abortboot

2016-07-01T21:42:55+00:00

Because abortboot_keyed() and abortboot_normal() are not compiled
at the same time, we can rename both of them to __abortboot().
This allows to drop #ifdef from the caller.

Signed-off-by: Masahiro Yamada 
Reviewed-by: Stefan Roese 
Reviewed-by: Simon Glass 
Reviewed-by: Heiko Schocher

autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK

2016-07-01T21:42:55+00:00

As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2
means the autoboot with no delay, with no abort check even if
CONFIG_ZERO_BOOTDELAY_CHECK is defined.

To sum up, the autoboot behaves as follows:

 [1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y
    autoboot with no delay, but you can abort it by key input

 [2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
    autoboot with no delay, with no check for abort

 [3] CONFIG_BOOTDELAY=-1
    disable autoboot

 [4] CONFIG_BOOTDELAY=-2
    autoboot with no delay, with no check for abort

As you notice, [2] and [4] come to the same result, which means we
do not need CONFIG_ZERO_BOOTDELAY_CHECK.  We can control all the
cases only by CONFIG_BOOTDELAY, like this:

 [1] CONFIG_BOOTDELAY=0
    autoboot with no delay, but you can abort it by key input

 [2] CONFIG_BOOTDELAY=-1
    disable autoboot

 [3] CONFIG_BOOTDELAY=-2
    autoboot with no delay, with no check for abort

This commit converts the logic as follow:
  CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
    --> CONFIG_BOOTDELAY=-2

Signed-off-by: Masahiro Yamada 
Reviewed-by: Stefan Roese 
Acked-by: Igor Grinberg 
Reviewed-by: Simon Glass 
Acked-by: Vladimir Zapolskiy 
Reviewed-by: Heiko Schocher 
Acked-by: Christian Riesch 
Acked-by: Hannes Schmelzer

doc: bootdelay: drop explanation about CONFIG_BOOTDELAY from README

2016-07-01T21:42:54+00:00

The same information now exists in common/Kconfig.  Do not duplicate
documentation from the point of view of maintainability.

Signed-off-by: Masahiro Yamada 
Reviewed-by: Simon Glass 
Reviewed-by: Heiko Schocher

ARM: socfpga: move CONFIG_BOOTDELAY to Kconfig for IS1 board

2016-07-01T21:42:54+00:00

This recently added board missed the tree-wide migration of
CONFIG_BOOTDELAY.

Signed-off-by: Masahiro Yamada 
Acked-by: Pavel Machek 
Reviewed-by: Heiko Schocher 
Reviewed-by: Stefan Roese