]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
9 years agoARM64: zynqmp: Fix psu_init_gpl* violations
Michal Simek [Mon, 8 Aug 2016 11:17:07 +0000 (13:17 +0200)] 
ARM64: zynqmp: Fix psu_init_gpl* violations

psu_init_gpl.c/h have pretty bad quality which requires additional fixes
to remove all reported warnings. Also coding style is bad.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Update psu_init_gpl* files for v2 silicon
Michal Simek [Mon, 8 Aug 2016 11:13:25 +0000 (13:13 +0200)] 
ARM64: zynqmp: Update psu_init_gpl* files for v2 silicon

Update configuration for 15eg silicon instead of 9eg v1.

Also with manual patch:
"xilinx_zynqmp_zcu102: Set QSPI clock divisor to "9""
(sha1: 39ba61813bd35969e94f8a355167d61ce2cd1fab)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoxilinx_zynqmp_zcu102: Set QSPI clock divisor to "9"
Mike Looijmans [Fri, 29 Jul 2016 08:07:57 +0000 (10:07 +0200)] 
xilinx_zynqmp_zcu102: Set QSPI clock divisor to "9"

The zynqmp_qspi driver assumes that the QSPI clock runs at 166666666 Hz,
set the divisor such that this is true. The IOPLL runs at 1500, so a
divisor of 0x0c would results in 125MHz.

The optimal divisor for the zcu102 would be "7", which would run the
clock at 214MHz and could thus generate almost 108MHz which is the max
clock rate for the flash chips on the board.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Acked-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Update Xen boot commands
Alistair Francis [Thu, 28 Jul 2016 22:44:38 +0000 (15:44 -0700)] 
ARM64: zynqmp: Update Xen boot commands

Update the Xen boot commands to add in all the required options for hardware
boot and QEMU boot.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Fix stack pointer initialization
Soren Brinkmann [Wed, 27 Jul 2016 21:12:03 +0000 (14:12 -0700)] 
ARM64: zynqmp: Fix stack pointer initialization

This partly reverts commit:
"ARM64: zynqmp: Add SPL support support"
(sha1: e6a9ed04e78cf87ec97e306fa4e7a1669ef98df6)

Stack can rewrite ATF code.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Fix cc108 support
Michal Simek [Tue, 10 May 2016 11:27:18 +0000 (13:27 +0200)] 
ARM: zynq: Fix cc108 support

There is incorrect reference to cc108 SPL
and also fix dts file to be aligned with the latest bitstream for this
board.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: defconfig: Remove unnecessary board specifc config files
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:46 +0000 (16:01 +0530)] 
zynq: defconfig: Remove unnecessary board specifc config files

Remove unnecessary board specifc config files for
zynq boards(microzed, picozed, ZC770(all), zed) and point
to zynq common config file.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: config: Enable CONFIG_NAND_ZYNQ through Kconfig
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:45 +0000 (16:01 +0530)] 
zynq: config: Enable CONFIG_NAND_ZYNQ through Kconfig

Enable config CONFIG_NAND_ZYNQ through kconfig for Zynq
XM011 board.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoKconfig: Move option CONFIG_NAND_ZYNQ to Kconfig
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:44 +0000 (16:01 +0530)] 
Kconfig: Move option CONFIG_NAND_ZYNQ to Kconfig

Move config option CONFIG_NAND_ZYNQ as Kconfig
option. All the board which needs to enable this
option canbe done through Kconfig.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: config: Enable CONFIG_SYS_NO_FLASH through defconfig
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:43 +0000 (16:01 +0530)] 
zynq: config: Enable CONFIG_SYS_NO_FLASH through defconfig

Enable config CONFIG_SYS_NO_FLASH through defconfig
for all zynq boards.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoKconfig: Move option CONFIG_SYS_NO_FLASH to Kconfig
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:42 +0000 (16:01 +0530)] 
Kconfig: Move option CONFIG_SYS_NO_FLASH to Kconfig

Move config option CONFIG_SYS_NO_FLASH as Kconfig
option. All the boards which needs to enable this
option can be done through defconfigs

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Define config USB_STORAGE through defconfig
Michal Simek [Wed, 27 Jul 2016 12:56:49 +0000 (14:56 +0200)] 
ARM64: zynqmp: Define config USB_STORAGE through defconfig

Define config USB_STORAGE through defconfig for all
Xilinx ZynqMP boards.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agousb: zynq: Define config USB_STORAGE through defconfig
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:41 +0000 (16:01 +0530)] 
usb: zynq: Define config USB_STORAGE through defconfig

Define config USB_STORAGE through defconfig for all
respective zynq boards

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agousb: Kconfig: Add Kconfigs entry USB_EHCI_ZYNQ
Siva Durga Prasad Paladugu [Wed, 27 Jul 2016 10:31:40 +0000 (16:01 +0530)] 
usb: Kconfig: Add Kconfigs entry USB_EHCI_ZYNQ

Add Kconfig entry config option for USB_EHCI_ZYNQ
and update the same to enable for all zynq boards
which supports USB

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Remove untested RSA configuration
Michal Simek [Thu, 28 Jul 2016 05:58:50 +0000 (07:58 +0200)] 
ARM: zynq: Remove untested RSA configuration

It is getting hard and hard to keep all defconfigs
up2date that's why remove all RSA defconfigs which are not regularly
tested. Keep only zc702 with RSA support.

Any board can support it by enabling
CONFIG_CMD_ZYNQ_AES=y
CONFIG_CMD_ZYNQ_RSA=y

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Remove undef from mini configuration
Michal Simek [Wed, 27 Jul 2016 12:45:25 +0000 (14:45 +0200)] 
ARM64: zynqmp: Remove undef from mini configuration

The patch:
"ARM64: zynqmp: Remove CONFIG_BOOTP_SERVERIP"
(sha1: a8b6a156c0f7fb99502229e454bc9c3b38645280)
removed symbol that's why there is no need to have undef
in mini configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Remove CONFIG_BOOTP_SERVERIP
Michal Simek [Wed, 27 Jul 2016 12:44:30 +0000 (14:44 +0200)] 
ARM: zynq: Remove CONFIG_BOOTP_SERVERIP

Do the same change which was done in ZynqMP by:
"ARM64: zynqmp: Remove CONFIG_BOOTP_SERVERIP"
(sha1: a8b6a156c0f7fb99502229e454bc9c3b38645280)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: net_boot: Align timeout for reaching prompt
Michal Simek [Tue, 19 Jul 2016 07:38:58 +0000 (09:38 +0200)] 
test/py: net_boot: Align timeout for reaching prompt

Align the first test with the second one to have the same timeout.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Make booting from SD possible without uEnv.txt
Mike Looijmans [Thu, 21 Jul 2016 13:55:02 +0000 (15:55 +0200)] 
ARM64: zynqmp: Make booting from SD possible without uEnv.txt

When booting from SD card, the kernel cannot find any rootfs.
It only works if you provide a "uEnv.txt" file on the SD card that
patches the bootargs.

If uEnv.txt does not exist, assume that the rootfs is on the second
partition of the SD card (or mmc device). To make this work, rename
"sdroot" to "sdroot0" so a simple script can switch between sd0 and sd1.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add missing loadbootenv_addr
Michal Simek [Fri, 22 Jul 2016 13:19:59 +0000 (15:19 +0200)] 
ARM64: zynqmp: Add missing loadbootenv_addr

Variable as incorrectly removed by:
"Merge tag 'v2016.05' into master"
(sha1: d61a4869f8f1b4debd2fcec3dbae405e096a2b06)

This patch take it back to the origin value.

Reported-by: Alexey Firago <alexey_firago@mentor.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Remove empty ifdef around caches
Michal Simek [Thu, 21 Jul 2016 11:47:52 +0000 (13:47 +0200)] 
microblaze: Remove empty ifdef around caches

Code around was removed because of move to Kconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Fix mdio test case
Michal Simek [Fri, 22 Jul 2016 09:59:54 +0000 (11:59 +0200)] 
test/py: Fix mdio test case

Use correct name for mdio.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Remove get_uart_clk()
Michal Simek [Thu, 14 Jul 2016 12:41:28 +0000 (14:41 +0200)] 
ARM64: zynqmp: Remove get_uart_clk()

ZynqMP will use reading clock freq directly from DT.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoserial: zynq: Read information about clock from DT
Michal Simek [Thu, 14 Jul 2016 12:40:03 +0000 (14:40 +0200)] 
serial: zynq: Read information about clock from DT

Read information about clock frequency from DT.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Enable CLK and SPL_CLK by default
Michal Simek [Thu, 14 Jul 2016 12:41:28 +0000 (14:41 +0200)] 
ARM64: zynqmp: Enable CLK and SPL_CLK by default

Serial driver starts to use clk framework that's why
enable it by default.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agodm: clk: Remove simple version of clk_get_by_index/name()
Michal Simek [Thu, 14 Jul 2016 11:11:37 +0000 (13:11 +0200)] 
dm: clk: Remove simple version of clk_get_by_index/name()

Simple version of clk_get_by_index() added by:
"dm: clk: Add a simple version of clk_get_by_index()"
(sha1: a4b10c088c4f6ef2e2bba33e8cfea369bcbbce44)
is only working for #clock-cells=<1> but not for
any other values. Fixed clocks is using #clock-cells=<0>
which requires full implementation.

Remove simplified versions of clk_get_by_index() and use full version.
Also remove empty clk_get_by_name() which is failing when it is called
which is useless.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add simple dm commands run without checking
Michal Simek [Thu, 14 Jul 2016 13:45:50 +0000 (15:45 +0200)] 
test/py: Add simple dm commands run without checking

Just to make sure that dm commands can operate.
This was problem on Microblaze in past.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add basic i2c tests
Michal Simek [Fri, 6 May 2016 11:31:17 +0000 (13:31 +0200)] 
test/py: Add basic i2c tests

This was tested on zcu102.

zc702 and zc706 are not working for me.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add basic mii and mdio tests
Michal Simek [Fri, 6 May 2016 11:30:48 +0000 (13:30 +0200)] 
test/py: Add basic mii and mdio tests

Add simple mii and mdio testing functions.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add experimental code for mmc testing
Michal Simek [Mon, 9 May 2016 12:45:54 +0000 (14:45 +0200)] 
test/py: Add experimental code for mmc testing

More partitions are handled.
Save information about saved file to structure.
Also use fs_generic commands to handle files.
Support fat, ext2 and ext4 filesystems.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add support for boot kernel with netboot
Michal Simek [Fri, 29 Apr 2016 13:21:27 +0000 (15:21 +0200)] 
test/py: Add support for boot kernel with netboot

Tested on zc706 and zcu102.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add loading stuff to QSPI for qspi boot
Michal Simek [Tue, 17 May 2016 14:00:38 +0000 (16:00 +0200)] 
test/py: Add loading stuff to QSPI for qspi boot

Load images over ethernet to qspi to test qspi boot.
This is experimental patch.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Add basic QSPI testing
Michal Simek [Wed, 16 Mar 2016 22:05:39 +0000 (23:05 +0100)] 
test/py: Add basic QSPI testing

This is the first attempt how to test qspi.
Detect SPI size. Read it all, random size, erase every block,
write random data with random size and read it back,
erase the whole qspi and at the end load kernel image via tftp
and save it to memory.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agotest/py: Detect timeout in phy negotiation
Michal Simek [Fri, 29 Apr 2016 11:53:37 +0000 (13:53 +0200)] 
test/py: Detect timeout in phy negotiation

If timeout happen it should be reported as fault.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
9 years agotest/py: Add support for extending timeout for large files
Michal Simek [Fri, 29 Apr 2016 13:52:48 +0000 (15:52 +0200)] 
test/py: Add support for extending timeout for large files

Slow network or big image filesize is not able to be finished
in 30s. Add option to user to extend timeout(in miliseconds).

env__net_tftp_readable_file = {
    "fn": "192.168.0.105:zc706/image.ub",
    "addr": 0x20000000,
    "size": 20484981,
    "crc32": "873a30ae",
    "timeout": 50000,
}

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agolibfdt: Add option to disable arch_fixup_fdt() calls
Michal Simek [Thu, 9 Jun 2016 14:00:30 +0000 (16:00 +0200)] 
libfdt: Add option to disable arch_fixup_fdt() calls

Disable arch_fixup_fdt() calls for cases where U-Boot shouldn't update
memory setup in DTB file.
One example of usage of this option is to boot OS with different memory
setup than U-Boot use.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Enable debug uart for zc770 dc1
Michal Simek [Wed, 13 Jul 2016 09:40:12 +0000 (11:40 +0200)] 
ARM: zynq: Enable debug uart for zc770 dc1

For debugging purpose.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Increase malloc space size
Michal Simek [Wed, 13 Jul 2016 09:39:18 +0000 (11:39 +0200)] 
ARM: zynq: Increase malloc space size

DM requires more and more space for boot.
Increase malloc space and make it align with ZynqMP boards.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add information about usb status on zcu102
Michal Simek [Wed, 13 Jul 2016 14:12:33 +0000 (16:12 +0200)] 
ARM64: zynqmp: Add information about usb status on zcu102

Extend dts with information about USB status.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add USB boot mode
Michal Simek [Fri, 29 Apr 2016 11:00:10 +0000 (13:00 +0200)] 
ARM64: zynqmp: Add USB boot mode

Add USB boot mode.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add support for zc1751-dc3 and enable SPL
Michal Simek [Wed, 18 May 2016 12:04:06 +0000 (14:04 +0200)] 
ARM64: zynqmp: Add support for zc1751-dc3 and enable SPL

Enable DC3 and SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add init files for zynqmp boards and enable SPL
Michal Simek [Wed, 13 Jan 2016 11:44:47 +0000 (12:44 +0100)] 
ARM64: zynqmp: Add init files for zynqmp boards and enable SPL

zcu102 - PetaLinux v2015.4 zcu102 BSP.
zc1751 - internal build May 18.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Ignore warnings from autogenerated files
Michal Simek [Thu, 14 Jul 2016 09:13:04 +0000 (11:13 +0200)] 
ARM64: zynqmp: Ignore warnings from autogenerated files

Autogenerated files contain casting issues and missing function
declaration and even usleep implementation. Suppress them for now
till these files are fixed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add prog_reg to xil_io.h
Michal Simek [Tue, 12 Jul 2016 12:25:45 +0000 (14:25 +0200)] 
ARM64: zynqmp: Add prog_reg to xil_io.h

Vivado is not putting this function to psu_init.c
file that's why this function is missing is some versions.
Make this function as weak to make sure that compilation is fine.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Fix warning for SPL builds
Michal Simek [Tue, 12 Jul 2016 13:46:34 +0000 (15:46 +0200)] 
ARM64: zynqmp: Fix warning for SPL builds

FPGA code is not called from SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agospl: Fix compilation warnings for arm64
Michal Simek [Wed, 27 Apr 2016 14:07:20 +0000 (16:07 +0200)] 
spl: Fix compilation warnings for arm64

Make code 64bit aware.

Warnings:
+../arch/arm/lib/spl.c: In function â€˜jump_to_image_linux’:
+../arch/arm/lib/spl.c:63:3: warning: cast to pointer from integer of
different size [-Wint-to-pointer-cast]
+../common/spl/spl_fat.c: In function â€˜spl_load_image_fat’:
+../common/spl/spl_fat.c:91:33: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Add ps7_init_gpl* for zc770 targets
Michal Simek [Fri, 20 May 2016 13:31:01 +0000 (15:31 +0200)] 
ARM: zynq: Add ps7_init_gpl* for zc770 targets

xm012 - nand x8

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agospi: xilinx: Read reg base address from DTS file
Michal Simek [Mon, 23 May 2016 12:35:28 +0000 (14:35 +0200)] 
spi: xilinx: Read reg base address from DTS file

Do not use DM with reg base hardcoding.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoapi: Disable api_net when DM is used
Michal Simek [Mon, 6 Jun 2016 08:58:40 +0000 (10:58 +0200)] 
api: Disable api_net when DM is used

When CONFIG_API is selected with DM_ETH this
error is present:
api/api_net.c: In function 'dev_enum_net':
api/api_net.c:61:35: warning: initialization from incompatible pointer
type
  struct eth_device *eth_current = eth_get_dev();
                                   ^
api/api_net.c:68:39: error: dereferencing pointer to incomplete type
  memcpy(di->di_net.hwaddr, eth_current->enetaddr, 6);
                                       ^
Disable api_net functions when ETH_DM is selected.

Signed-off-by: Chris Johns <chrisj@rtems.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq/zynqmp: Use the default CONFIG_BOOTDELAY=2
Michal Simek [Tue, 21 Jun 2016 12:39:11 +0000 (14:39 +0200)] 
ARM: zynq/zynqmp: Use the default CONFIG_BOOTDELAY=2

Based on:
"ARM: uniphier: use the default CONFIG_BOOTDELAY=2"
(sha1: 7c8ef0feb97586d35b0296b48903daef8c06ab21)

"I do not insist on CONFIG_BOOTDELAY=3. The default value in Kconfig,
CONFIG_BOOTDELAY=2, is just fine for these boards."

Reported-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoMerge tag 'v2016.07' into master
Michal Simek [Tue, 12 Jul 2016 09:57:46 +0000 (11:57 +0200)] 
Merge tag 'v2016.07' into master

Prepare v2016.07

- arm64
    Revert "armv8: Enable CPUECTLR.SMPEN for coherency"
    This reverts commit d73718f3236c520a92efa401084c658e6cc067f3.
 because it is breaking starting bootflow with ATF
- zynq_nand - Fix code based on mainline patches
  "mtd: nand: Add+use mtd_to/from_nand and nand_get/set_controller_data"
  (sha1: 17cb4b8f327eb983cef7c510fcf77f1635a00e48)
  "mtd: nand: Add page argument to write_page() etc."
  (sha1: 81c772521ff26054a3fe75efa87d8daeae83e9b4)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add support for chip ID detection
Michal Simek [Mon, 1 Feb 2016 14:05:58 +0000 (15:05 +0100)] 
ARM64: zynqmp: Add support for chip ID detection

Chip ID needs to be known for loading bitstream because
U-Boot checks ID from bitstream header in BIT format.
BIN format is completely unchecked.

SMC calls are disabled because code depends on ATF changes which are not
in release version.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoPrepare v2016.07 v2016.07
Tom Rini [Mon, 11 Jul 2016 19:01:01 +0000 (15:01 -0400)] 
Prepare v2016.07

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agodoc: ARMv8: add README.pine64
Andre Przywara [Fri, 8 Jul 2016 14:25:23 +0000 (15:25 +0100)] 
doc: ARMv8: add README.pine64

Since we lack information about the DRAM initialization for the
Allwinner A64 SoC, booting any A64 based board like the Pine64 is a bit
involved at the moment.
Add a README file to explain the process.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Move to board/sunxi/ from doc/]
Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agomkimage -l is broken for images after gpimage
Stefano Babic [Mon, 11 Jul 2016 14:09:48 +0000 (16:09 +0200)] 
mkimage -l is broken for images after gpimage

Because a gpimage cannot be detected, a false
GP header is printed instead of checking
for further image types.

Move gpimage as last to be linked, letting check
all other image types and printing a GP header just
in case no image is detected.

Signed-off-by: Stefano Babic <sbabic@denx.de>
9 years agogit-mailrc: add rockchip alias
jk.kernel@gmail.com [Sat, 9 Jul 2016 13:12:04 +0000 (21:12 +0800)] 
git-mailrc: add rockchip alias

It's easier to Cc rockchip maintainers on rockchip-releated patches.

Signed-off-by: jk <jk.kernel@gmail.com>
9 years agoxilinx: Remove ip and serverip address setup
Michal Simek [Tue, 21 Jun 2016 13:32:33 +0000 (15:32 +0200)] 
xilinx: Remove ip and serverip address setup

This setting is board dependent and not acceptable for mainline
submission.

Error log on zcu102:
setenv ipaddr 10.10.70.1 && setenv partid auto" (type: i)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoMerge tag 'v2016.05' into master
Michal Simek [Mon, 11 Jul 2016 14:02:29 +0000 (16:02 +0200)] 
Merge tag 'v2016.05' into master

Prepare v2016.05

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoarmv8: Enable CPUECTLR.SMPEN for coherency
Mingkai Hu [Thu, 7 Jul 2016 04:22:12 +0000 (12:22 +0800)] 
armv8: Enable CPUECTLR.SMPEN for coherency

For A53, data coherency is enabled only when the CPUECTLR.SMPEN bit is
set. The SMPEN bit should be set before enabling the data cache.
If not enabled, the cache is not coherent with other cores and
data corruption could occur.

For A57/A72, SMPEN bit enables the processor to receive instruction
cache and TLB maintenance operations broadcast from other processors
in the cluster. This bit should be set before enabling the caches and
MMU, or performing any cache and TLB maintenance operations.

Signed-off-by: Mingkai Hu <mingkai.hu@nxp.com>
Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agotest/py: support 'memstart =' in u_boot_utils.find_ram_base()
Daniel Schwierzeck [Wed, 6 Jul 2016 10:44:22 +0000 (12:44 +0200)] 
test/py: support 'memstart =' in u_boot_utils.find_ram_base()

Some archs like MIPS or PPC have a different 'bdinfo' output
than ARM regarding the memory configuration. Also support
'memstart = 0x*' in u_boot_utils.find_ram_base() to make
all tests requiring the RAM base working on those archs.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
9 years agotest/py: strip VT100 codes from match buffer
Stephen Warren [Wed, 6 Jul 2016 16:34:30 +0000 (10:34 -0600)] 
test/py: strip VT100 codes from match buffer

Prior to this patch, any VT100 codes emitted by U-Boot are considered part
of a command's output, which often causes tests to fail. For example,
test_env_echo_exists executes printenv, and then considers any text on a
line before an = sign as a valid U-Boot environment variable name. This
includes any VT100 codes emitted. When the test later attempts to use that
variable, the name would be invalid since it includes the VT100 codes.
Solve this by stripping VT100 codes from the match buffer, so they are
never seen by higher level test code.

The codes are still logged unmodified, so that users can expect U-Boot's
exact output without interference. This does clutter the log file a bit.
However, it allows users to see exactly what U-Boot emitted rather than a
modified version, which hopefully is better for debugging. It's also much
simpler to implement, since logging happens as soon as text is received,
and so stripping the VT100 codes from the log would require handling
reception and stripping of partial VT100 codes.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
9 years agoarm: Fix setjmp (again)
Alexander Graf [Tue, 5 Jul 2016 18:37:17 +0000 (20:37 +0200)] 
arm: Fix setjmp (again)

Commit e677724 (arm: Fix setjmp) added code to fix compilation of the setjmp
code path with thumv1. Unfortunately it missed a constraint that the adr
instruction can only refer to 4 byte aligned offsets.

So this patch adds the required alignment hooks to make compilation
work again even when setjmp doesn't happen to be 4 byte aligned.

Signed-off-by: Alexander Graf <agraf@suse.de>
Tested-by: Tom Rini <trini@konsulko.com>
9 years agoSPL: tiny-printf: avoid any BSS usage
Andre Przywara [Fri, 8 Jul 2016 14:18:35 +0000 (15:18 +0100)] 
SPL: tiny-printf: avoid any BSS usage

As printf calls may be executed quite early, we should avoid using any
BSS stored variables, since some boards put BSS in DRAM, which may not
have been initialised yet.
Explicitly mark those "static global" variables as belonging to the
.data section, to keep tiny-printf clear of any BSS usage.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
9 years agotest/py: fix CONFIG_ tests
Stephen Warren [Wed, 6 Jul 2016 15:04:08 +0000 (09:04 -0600)] 
test/py: fix CONFIG_ tests

Some CONFIG_ variables were recently renamed, but test/py wasn't updated
to match. This causes some tests to be skipped. Fix test/py so the tests
are run.

Fixes: 11636258981a ("Rename reset to sysreset")
Fixes: f1f9d4fac527 ("hush: complete renaming CONFIG_SYS_HUSH_PARSER to CONFIG_HUSH_PARSER")
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
9 years agommc: msm_sdhci: Set mmc->dev pointer in msm_sdc_probe()
Mateusz Kulikowski [Sun, 26 Jun 2016 20:43:55 +0000 (22:43 +0200)] 
mmc: msm_sdhci: Set mmc->dev pointer in msm_sdc_probe()

MMC core expects (now) valid mmc->dev pointer.
During conversion in commit cffe5d86 not every driver was updated.

This patch fixes crash while accessing MMC on
boards using Qualcomm SDHCI controller.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Thu, 7 Jul 2016 13:58:41 +0000 (09:58 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-usb

9 years agopowerpc: mpc85xx: kmp204x: Fix compiling error for usb errata
York Sun [Wed, 6 Jul 2016 23:39:51 +0000 (16:39 -0700)] 
powerpc: mpc85xx: kmp204x: Fix compiling error for usb errata

Commit 9262367 moves USB errata workaround into a C file. This
causes compiling error for kmcoge4 and kmlion1. To enable the
errata workaround, define CONFIG_USB_EHCI_FSL in common header.

Signed-off-by: York Sun <york.sun@nxp.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Ed Swarthout <Ed.Swarthout@nxp.com>
Cc: Sriram Dash <sriram.dash@nxp.com>
Fixes: 92623672f9d3 ("fsl: usb: make errata function common for PPC and ARM")
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-tegra
Tom Rini [Wed, 6 Jul 2016 19:55:36 +0000 (15:55 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-tegra

9 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Tom Rini [Wed, 6 Jul 2016 19:55:21 +0000 (15:55 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-net

9 years agonet: rtl8169: Fix return value for rtl_send_common
Oleksandr Tymoshenko [Fri, 1 Jul 2016 20:22:00 +0000 (13:22 -0700)] 
net: rtl8169: Fix return value for rtl_send_common

Return value of rtl_send_common propogates unmodified all the way
up to eth_send and further to API consumer if CONFIG_API is enabled.
Previously rtl_send_common returned number of bytes sent on success
which was erroneouly detected as error condition by API consumers
that checked for operation success by comparing return value with 0.

Switch rtl_send_common to use common convention: return 0 on success
and negative value for failure.

Cc: Stephen Warren <swarren@nvidia.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Oleksandr Tymoshenko <gonzo@bluezbox.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: Fix incorrect RPC packets on 64-bit systems
Ralf Hubert [Fri, 1 Jul 2016 11:19:51 +0000 (13:19 +0200)] 
net: Fix incorrect RPC packets on 64-bit systems

This patch fixes incorrect RPC packet layout caused by
'long' type size difference on 64 and 32-bit architectures.

Signed-off-by: Ralf Hubert <r.hubert@technisat.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agodriver: net: phylib: add support for aquantia AQR106/107 PHY
Mingkai Hu [Fri, 1 Jul 2016 11:03:23 +0000 (19:03 +0800)] 
driver: net: phylib: add support for aquantia AQR106/107 PHY

This patch adds support for aquantia AQR106/107 PHY.

Signed-off-by: Mingkai Hu <mingkai.hu@nxp.com>
Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: designware: Make driver independent from DM_GPIO again
Alexey Brodkin [Mon, 27 Jun 2016 10:17:51 +0000 (13:17 +0300)] 
net: designware: Make driver independent from DM_GPIO again

Commit 90b7fc924adf "net: designware: support phy reset device-tree
bindings" made DW GMAC driver dependent on DM_GPIO by unconditional
usage of purely DM_GPIO stuff like:
 * dm_gpio_XXX()
 * gpio_request_by_name()

But since that driver as of today might be easily used without
DM_GPIO (that's the case for Synopsys AXS10x boards) we're
shielding all DM_GPIO things by ifdefs.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Beniamino Galvani <b.galvani@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agocommon: Always include errno.h in common.h
Joe Hershberger [Mon, 4 Apr 2016 09:07:33 +0000 (04:07 -0500)] 
common: Always include errno.h in common.h

We want people using errnos for errors instead of -1, so make it easy
by always including the definition of all the errnos.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agofdt: Drop some unused compatible strings
Simon Glass [Sun, 8 May 2016 22:55:22 +0000 (16:55 -0600)] 
fdt: Drop some unused compatible strings

We have driver-model drivers for some of these now, so drop them.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agotegra: video: Always use write-through cache on LCD
Simon Glass [Sun, 8 May 2016 22:55:21 +0000 (16:55 -0600)] 
tegra: video: Always use write-through cache on LCD

This seems to give the best performance, so let's use it always.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agovideo: tegra: Move to using simple-panel and pwm-backlight
Simon Glass [Sun, 8 May 2016 22:55:20 +0000 (16:55 -0600)] 
video: tegra: Move to using simple-panel and pwm-backlight

We have standard drivers for panels and backlights which can do most of the
work for us. Move the tegra20 LCD driver over to use those instead of custom
code.

This patch includes device tree changes for the nvidia boards. I have only
been able to test seaboard. If this patch is applied, these boards will
also need to be synced with the kernel, and updated to use display-timings:

   - colibri
   - medcom-wide
   - paz00
   - tec

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agotegra: dts: Sync tegra20 device tree files with Linux
Simon Glass [Sun, 8 May 2016 22:55:19 +0000 (16:55 -0600)] 
tegra: dts: Sync tegra20 device tree files with Linux

Sync everything except the display panel, which will come in a future patch.
One USB port is left disabled since we don't want to support it in U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agoerrno: Allow errno_str() to be used without CONFIG_ERRNO_STR
Simon Glass [Sun, 8 May 2016 22:55:18 +0000 (16:55 -0600)] 
errno: Allow errno_str() to be used without CONFIG_ERRNO_STR

The pmic framework uses errno_str() and this requires board that use it to
enable CONFIG_ERRNO_STR to avoid a build error. Update the header to provide
a NULL error message when CONFIG_ERRNO_STR is not defined, and fix the build
error.

This will show as "(null)" when U-Boot prints it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agoerrno: Add copyright header and header guard
Simon Glass [Sun, 8 May 2016 22:55:17 +0000 (16:55 -0600)] 
errno: Add copyright header and header guard

Bring in a copyright for this file from cmd/pmic.c since this file was
submitted by the same author at around the same time. Also fix the missing
header guard.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agopci: tegra: actually program REFCLK_CFG* on recent SoCs
Stephen Warren [Fri, 24 Jun 2016 14:36:04 +0000 (08:36 -0600)] 
pci: tegra: actually program REFCLK_CFG* on recent SoCs

On recent SoCs, tegra_pcie_phy_enable() isn't called; but instead
tegra_pcie_enable_controller() calls tegra_xusb_phy_enable(). However,
part of tegra_pcie_phy_enable() needs to happen in all cases. Move that
code to tegra_pcie_port_enable() instead.

For reference, NVIDIA's downstream Linux kernel performs this operation
in tegra_pcie_enable_rp_features(), which is called immediately after
tegra_pcie_port_enable(). Since that function doesn't exist in the U-Boot
driver, we'll just add it to the tail of tegra_pcie_port_enable() instead.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agopci: tegra: correctly program PADS_REFCLK registers
Stephen Warren [Tue, 21 Jun 2016 18:47:51 +0000 (12:47 -0600)] 
pci: tegra: correctly program PADS_REFCLK registers

The value that should be programmed into the PADS_REFCLK register varies
per SoC. Fix the Tegra PCIe driver to program the correct values. Future
SoCs will require different values in cfg0/1, so the two values are stored
separately in the per-SoC data structures.

For reference, the values are all documented in NV bug 1771116 comment 20.
The Tegra210 value doesn't match the current TRM, but I've filed a bug to
get the TRM fixed. Earlier TRMs don't document the value this register
should contain, but the ASIC team has validated all these values, except
for the Tegra20 value which is simply left unchanged in this patch.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
9 years agorockchip: video: Lower hpd wait time
Sjoerd Simons [Sun, 28 Feb 2016 21:40:02 +0000 (22:40 +0100)] 
rockchip: video: Lower hpd wait time

Waiting 30 seconds for the hpd to go high seems a bit much, especially
on headless boots. Lowering the timeout to 300ms.

Sending as RFC because frankly i don't know what a sensible timeout is
here, but 30 seconds is clearly not it :)

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Simon Glass <sjg@chromium.org>
Dropped RFC tag:
Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agopowerpc: mpc85xx: Do not build errata command in SPL
Marek Vasut [Tue, 5 Jul 2016 15:40:27 +0000 (17:40 +0200)] 
powerpc: mpc85xx: Do not build errata command in SPL

The errata command is useless in SPL, so don't build it. This fixes
multiple build failures on PowerPC.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: York Sun <york.sun@nxp.com>
Fixes: 92623672f9d3 ("fsl: usb: make errata function common for PPC and ARM")
9 years agousb: dm: Make "usb info" use usb_for_each_root_dev()
Hans de Goede [Sun, 3 Jul 2016 18:22:05 +0000 (20:22 +0200)] 
usb: dm: Make "usb info" use usb_for_each_root_dev()

The old dm "usb info" implementation has several issues:

1) NULL pointer deref when a bus has no children
2) Not showing usb devices on busses without an emulated root-hub (otg host)
3) Attempting to show devices on inactive busses
4) "usb info" Would cause some hosts to get re-probed something which only
   "usb reset" should do

TL;DR: proper iterating over usb bus root devs is hard, use the helper
for it.

Reported-by: Bernhard Nortmann <bernhard.nortmann@web.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agousb: dm: Add a usb_for_each_root_dev() helper function
Hans de Goede [Sun, 3 Jul 2016 18:22:04 +0000 (20:22 +0200)] 
usb: dm: Add a usb_for_each_root_dev() helper function

Iterating over usb-root devs and doing something for all of them is
a bit tricky with dm, factor out the proven usb_show_tree() for this
into a helper function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agoMerge git://git.denx.de/u-boot-arc
Tom Rini [Mon, 4 Jul 2016 15:46:21 +0000 (11:46 -0400)] 
Merge git://git.denx.de/u-boot-arc

9 years agoarc: make global_data.h usable in assembly files
Alexey Brodkin [Mon, 4 Jul 2016 08:37:55 +0000 (11:37 +0300)] 
arc: make global_data.h usable in assembly files

Currently on attempt to use global_data.h in an assembly file following
will happen:
-------------------->8-----------------
./arch/arc/include/asm/global_data.h: Assembler messages:
./arch/arc/include/asm/global_data.h:11: Error: bad instruction 'struct arch_global_data{'
./arch/arc/include/asm/global_data.h:12: Error: junk at end of line, first unrecognized character is `}'
scripts/Makefile.build:316: recipe for target 'arch/arc/lib/start.o' failed
-------------------->8-----------------

In this change we disable struct arch_global_data in ASM which fixes
the issue above.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
9 years agoarc: Use "-mcpu=archs" instead of deprecated "-marchs" for ARC HS
Alexey Brodkin [Thu, 16 Jun 2016 08:55:00 +0000 (10:55 +0200)] 
arc: Use "-mcpu=archs" instead of deprecated "-marchs" for ARC HS

Newer ARC toolchains don't support "-marchs" option any longer.
Instead "-mcpu=archs" should be used. What's also important older
toiolchains that support ARC HS cores will also happily accept
"-mcpu=archs" so that's a very safe move.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
9 years agoMerge branch 'master' of http://git.denx.de/u-boot-sunxi
Tom Rini [Sat, 2 Jul 2016 20:32:15 +0000 (16:32 -0400)] 
Merge branch 'master' of http://git.denx.de/u-boot-sunxi

9 years agosunxi: Add defconfig and DTS file for Allwinner R16 EVB (Parrot)
Quentin Schulz [Fri, 24 Jun 2016 12:33:35 +0000 (14:33 +0200)] 
sunxi: Add defconfig and DTS file for Allwinner R16 EVB (Parrot)

The Parrot Board is an evaluation board with an Allwinner R16 (assumed
to be close to an Allwinner A33), 4GB of eMMC, 512MB of RAM, USB host
and OTG, a WiFi/Bluetooth combo chip, a micro SD Card reader, 2
controllable buttons, an LVDS port with separated backlight and
capacitive touch panel ports, an audio/microphone jack, a camera CSI
port, 2 sets of 22 GPIOs and an accelerometer.

The DTS file is identical to the one submitted to the upstream kernel.

Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: Add missing boot_media fields in the SPL header
Olliver Schinagl [Mon, 13 Jun 2016 16:13:07 +0000 (18:13 +0200)] 
sunxi: Add missing boot_media fields in the SPL header

Commit b19236fd1 ("sunxi: Increase SPL header size to 64 bytes to avoid
code corruption") Added defines for MMC0 and SPI as boot identification.
After verifying on an OLinuXino Lime2 with NAND and eMMC, the expected
values have been confirmed and added to spl.h

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: spl: Fix DRAM info printing
Hans de Goede [Sun, 26 Jun 2016 11:56:01 +0000 (13:56 +0200)] 
sunxi: spl: Fix DRAM info printing

The switch to simple_printf was causing the SPL dram info to show as:

DRAM: u MiB

This fixes this by switching from %lu to %d for printing the DRAM size.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Sat, 2 Jul 2016 02:35:20 +0000 (22:35 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-usb

9 years agoMerge branch 'master' of git://git.denx.de/u-boot-socfpga
Tom Rini [Sat, 2 Jul 2016 02:35:12 +0000 (22:35 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-socfpga

9 years agoPrepare v2016.07-rc3 v2016.07-rc3
Tom Rini [Fri, 1 Jul 2016 21:37:17 +0000 (17:37 -0400)] 
Prepare v2016.07-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-uniphier
Tom Rini [Fri, 1 Jul 2016 21:43:06 +0000 (17:43 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-uniphier

9 years agommc: increase MMC SDHCI read status timeout
Steve Rae [Wed, 29 Jun 2016 20:42:01 +0000 (13:42 -0700)] 
mmc: increase MMC SDHCI read status timeout

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 <steve.rae@raedomain.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
9 years agoti_omap5_common: Find right dtb file for DRA72-RevC Evm
Lokesh Vutla [Wed, 29 Jun 2016 09:20:41 +0000 (14:50 +0530)] 
ti_omap5_common: Find right dtb file for DRA72-RevC Evm

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

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
9 years agoautoboot: move bootdelay >= 0 check to abortboot()
Masahiro Yamada [Mon, 27 Jun 2016 07:23:04 +0000 (16:23 +0900)] 
autoboot: move bootdelay >= 0 check to abortboot()

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

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>