]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
9 years agonet: emaclite: Fix logic around available TX buffers
Michal Simek [Thu, 10 Dec 2015 14:42:01 +0000 (15:42 +0100)] 
net: emaclite: Fix logic around available TX buffers

Simplify logic how to find out if there is free TX buffer.
Both buffers are checked all the time that's why logic around order
can be removed.
Also add check when only one buffer is available.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: emaclite: Use indirect register access for TX reset
Michal Simek [Thu, 10 Dec 2015 14:32:11 +0000 (15:32 +0100)] 
net: emaclite: Use indirect register access for TX reset

Move to use indirect register access when timeout expires for resetting
TX buffers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: emaclite: Use indirect register access for rx_ping/pong
Michal Simek [Thu, 10 Dec 2015 14:24:23 +0000 (15:24 +0100)] 
net: emaclite: Use indirect register access for rx_ping/pong

Do initialization via indirect register access.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agonet: emaclite: Use indirect register access for tx_ping/pong
Michal Simek [Thu, 10 Dec 2015 14:22:21 +0000 (15:22 +0100)] 
net: emaclite: Use indirect register access for tx_ping/pong

Do initialization via indirect register access.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: emaclite: Convert MDIO to use register offset
Michal Simek [Thu, 10 Dec 2015 13:18:15 +0000 (14:18 +0100)] 
net: emaclite: Convert MDIO to use register offset

Use u-boot coding style how to setup and access MDIO bus.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: emaclite: Sync MDIO support with mainline
Michal Simek [Thu, 14 Jan 2016 08:56:04 +0000 (09:56 +0100)] 
net: emaclite: Sync MDIO support with mainline

Sync MDIO support before move to DM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agonet: emaclite: Remove ancient OF probe function
Michal Simek [Tue, 8 Dec 2015 13:57:33 +0000 (14:57 +0100)] 
net: emaclite: Remove ancient OF probe function

Prepare for DM move.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: Add axi emac to Kconfig
Michal Simek [Wed, 9 Dec 2015 15:54:42 +0000 (16:54 +0100)] 
net: Add axi emac to Kconfig

Also add dependency on PHYLIB and MII which is required.
Clean PHYLIB dependency from the driver too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Rename start, stop, write_hwaddr functions
Michal Simek [Wed, 16 Dec 2015 08:18:12 +0000 (09:18 +0100)] 
net: axi_emac: Rename start, stop, write_hwaddr functions

Rename few functions to fit to the new name convention used by DM.

Suggested-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agonet: axi_emac: Split recv from free_pkt
Michal Simek [Wed, 9 Dec 2015 13:13:23 +0000 (14:13 +0100)] 
net: axi_emac: Split recv from free_pkt

Call net_process_received_packet() by core.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Enable access to MDIO in probe
Michal Simek [Tue, 8 Dec 2015 15:10:05 +0000 (16:10 +0100)] 
net: axi_emac: Enable access to MDIO in probe

Detect phy when driver probes.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Move driver to DM
Michal Simek [Tue, 8 Dec 2015 14:44:41 +0000 (15:44 +0100)] 
net: axi_emac: Move driver to DM

Move driver to DM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Pass private structure where possible
Michal Simek [Wed, 9 Dec 2015 13:53:51 +0000 (14:53 +0100)] 
net: axi_emac: Pass private structure where possible

Use axidma_priv instead of ethdevice in preparation of the DM move.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agonet: axi_emac: Pass private structure to phyread/phywrite
Michal Simek [Wed, 9 Dec 2015 13:44:38 +0000 (14:44 +0100)] 
net: axi_emac: Pass private structure to phyread/phywrite

Prepare for move to DM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Put iobase to private structure
Michal Simek [Wed, 9 Dec 2015 13:39:42 +0000 (14:39 +0100)] 
net: axi_emac: Put iobase to private structure

Saving iobase directly to private structure helps with moving to DM.
There is an option to load iobase from pdata but it is additional load.
Pointer to private structure is available all the time.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Pass directly pointer to register space
Michal Simek [Wed, 9 Dec 2015 13:36:31 +0000 (14:36 +0100)] 
net: axi_emac: Pass directly pointer to register space

Simplify mdio_wait function by passing regs directly.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agonet: axi_emac: Show phy address instead of register content
Michal Simek [Wed, 9 Dec 2015 09:54:53 +0000 (10:54 +0100)] 
net: axi_emac: Show phy address instead of register content

Fix debug message.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agomicroblaze: Enable MICREL_KSZ9021
Michal Simek [Thu, 14 Jan 2016 08:15:33 +0000 (09:15 +0100)] 
microblaze: Enable MICREL_KSZ9021

To solve enabling ETH_DM where ksz90x1_reg_field is defined only when
additional Micrel type is defined.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Wire-up debug_uart in asm
Michal Simek [Thu, 10 Dec 2015 11:55:39 +0000 (12:55 +0100)] 
microblaze: Wire-up debug_uart in asm

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Remove unused I2C macros
Michal Simek [Wed, 9 Dec 2015 12:02:10 +0000 (13:02 +0100)] 
microblaze: Remove unused I2C macros

There is no i2c driver in the current u-boot.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Enable PHYLIB via Kconfig
Michal Simek [Tue, 8 Dec 2015 14:01:31 +0000 (15:01 +0100)] 
microblaze: Enable PHYLIB via Kconfig

Cleanup board configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Do not print eth device when DM_ETH is enabled
Michal Simek [Tue, 8 Dec 2015 14:39:24 +0000 (15:39 +0100)] 
microblaze: Do not print eth device when DM_ETH is enabled

Doing the same fix as is done for ARM by:
"Avoid calling print_eths() with driver model"
(sha1: ff97380015b6b5d7d6267417a1cd6fc0e67b81bc)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agomicroblaze: Enable uart16550 DM by default
Michal Simek [Wed, 9 Dec 2015 11:50:05 +0000 (12:50 +0100)] 
microblaze: Enable uart16550 DM by default

Microblaze is uses uartlite or uart16550 as console drivers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoserial: uartlite: Add uartlite to Kconfig
Michal Simek [Wed, 9 Dec 2015 11:50:05 +0000 (12:50 +0100)] 
serial: uartlite: Add uartlite to Kconfig

- Move config option out of board file.
- Remove uartlite address from config file

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Thomas Chou <thomas@wytron.com.tw>
9 years agoserial: uartlite: Add support for debug console
Michal Simek [Mon, 14 Dec 2015 15:55:10 +0000 (16:55 +0100)] 
serial: uartlite: Add support for debug console

Add support for debug console.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Thomas Chou <thomas@wytron.com.tw>
9 years agoserial: uartlite: Move driver to DM
Michal Simek [Tue, 1 Dec 2015 13:24:20 +0000 (14:24 +0100)] 
serial: uartlite: Move driver to DM

Enable SPL DM too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Thomas Chou <thomas@wytron.com.tw>
9 years agomicroblaze: Move baudrate setting out driver selection
Michal Simek [Wed, 9 Dec 2015 11:42:16 +0000 (12:42 +0100)] 
microblaze: Move baudrate setting out driver selection

Preparation of moving to DM. Uartlite ignores baudrate setting.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agomicroblaze: Remove CONSOLE_ARG
Michal Simek [Wed, 9 Dec 2015 11:40:37 +0000 (12:40 +0100)] 
microblaze: Remove CONSOLE_ARG

Take it from DT instead.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Sync SPL support with mainline
Michal Simek [Thu, 14 Jan 2016 09:03:55 +0000 (10:03 +0100)] 
ARM: zynq: Sync SPL support with mainline

BSS section is placed in DDR which is already up and running that's why
FAT buffers can stay there and don't need to be place to ddr section
because it is already there.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agofpga: zynqmp: Enable PL bitstream loading support
Siva Durga Prasad Paladugu [Wed, 13 Jan 2016 10:55:38 +0000 (16:25 +0530)] 
fpga: zynqmp: Enable PL bitstream loading support

Enable PL bitstream loading support for ZynqMP

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agofpga: xilinx: zynqmp: Add PL bitstream dowload support for ZynqMP
Siva Durga Prasad Paladugu [Wed, 13 Jan 2016 10:55:37 +0000 (16:25 +0530)] 
fpga: xilinx: zynqmp: Add PL bitstream dowload support for ZynqMP

Add PL bitstream dowload support for ZynqMP
Bitstream  will be validated by uboot and loaded
to PL  by invoking an smc instruction to arm trusted
firmware, it will takecare of loading it to PL

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynqmp: Enable asm helper code for zynqMP
Siva Durga Prasad Paladugu [Wed, 13 Jan 2016 10:55:36 +0000 (16:25 +0530)] 
zynqmp: Enable asm helper code for zynqMP

Enable asm helper code for zynqMP. This will
enable zynqMP to invoke smc instructions

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoarm: smc: Add helper asm code for invoking smc
Siva Durga Prasad Paladugu [Wed, 13 Jan 2016 10:55:35 +0000 (16:25 +0530)] 
arm: smc: Add helper asm code for invoking smc

Added helper ASM code for calling SMC instructions

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agofpga: xilinx: Fix fpga code compilation for arm64
Michal Simek [Wed, 13 Jan 2016 14:12:50 +0000 (15:12 +0100)] 
fpga: xilinx: Fix fpga code compilation for arm64

Compilation warning:
w-../drivers/fpga/xilinx.c: In function ‘fpga_loadbitstream’:
w-../drivers/fpga/xilinx.c:78:7: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add dts files for zcu102-revB
Michal Simek [Wed, 13 Jan 2016 14:10:46 +0000 (15:10 +0100)] 
ARM64: zynqmp: Add dts files for zcu102-revB

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add helper variables for Android boot
Michal Simek [Thu, 7 Jan 2016 15:36:32 +0000 (16:36 +0100)] 
ARM64: zynqmp: Add helper variables for Android boot

New board variable helps with board identification. Maybe in future
better mechanism can be use.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Add 2 helper functions for earlyconsole bootargs
Michal Simek [Thu, 7 Jan 2016 15:33:23 +0000 (16:33 +0100)] 
ARM64: zynqmp: Add 2 helper functions for earlyconsole bootargs

Setup earlycon from u-boot prompt via helper variables.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agocommon: zynq_rsa: Add support to load PL bitstream using zynqrsa
Siva Durga Prasad Paladugu [Mon, 11 Jan 2016 12:58:20 +0000 (18:28 +0530)] 
common: zynq_rsa: Add support to load PL bitstream using zynqrsa

Added support to load authenticated and encrypted PL bitstream
using zynqrsa command if partition owner is specified as uboot
while preparing boot image.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agommc: zynq_sdhci: Added qurik to disable high speed
Siva Durga Prasad Paladugu [Tue, 12 Jan 2016 09:42:16 +0000 (15:12 +0530)] 
mmc: zynq_sdhci: Added qurik to disable high speed

Add quirk to disable high speed incase the high
speed was broken.This solves the issue where the
the controller is used in High Speed Mode and the
the hold time requirement for the JEDEC/MMC 4.41
specification is NOT met.
This timing issue is not on all boards and hence
provided config option to enable it when required.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Emil Lenchak <emill@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agommc: sdhci: Clear high speed if not supported
Siva Durga Prasad Paladugu [Tue, 12 Jan 2016 09:42:15 +0000 (15:12 +0530)] 
mmc: sdhci: Clear high speed if not supported

Clear high speed bit if it was not supported by
the driver.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Emil Lenchak <emill@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM64: zynqmp: Remove unneeded timer_init function
Michal Simek [Wed, 13 Jan 2016 11:47:04 +0000 (12:47 +0100)] 
ARM64: zynqmp: Remove unneeded timer_init function

Empty weak function is used instead.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoserial: zynq: Fix address reading from DM
Michal Simek [Tue, 12 Jan 2016 13:45:49 +0000 (14:45 +0100)] 
serial: zynq: Fix address reading from DM

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Fix all remaining zynq platform to use stdout-path
Michal Simek [Tue, 12 Jan 2016 12:56:44 +0000 (13:56 +0100)] 
ARM: zynq: Fix all remaining zynq platform to use stdout-path

Fix console setup for all remaining zynq boards.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Extend microzed board support
Michal Simek [Tue, 12 Jan 2016 07:06:36 +0000 (08:06 +0100)] 
ARM: zynq: Extend microzed board support

Add missing DT nodes and enable USB.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agospi_flash: Add support of qeb set to ISSI devices
Siva Durga Prasad Paladugu [Sun, 24 Jan 2016 13:59:05 +0000 (19:29 +0530)] 
spi_flash: Add support of qeb set to ISSI devices

Added support to set quad enable bit for ISSI devices

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: defconfig: Move spi flash entries to defconfig
Michal Simek [Tue, 26 Jan 2016 12:21:13 +0000 (13:21 +0100)] 
zynq: defconfig: Move spi flash entries to defconfig

This is the part of common config cleanup.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agospi: Kconfig: Add ISSI Kconfig entry
Michal Simek [Mon, 25 Jan 2016 14:39:26 +0000 (15:39 +0100)] 
spi: Kconfig: Add ISSI Kconfig entry

Add ISSI to Kconfig to make it selectable via menuconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: RSA: Update zynq zc702 and zc706 configs
Siva Durga Prasad Paladugu [Thu, 21 Jan 2016 12:18:29 +0000 (17:48 +0530)] 
zynq: RSA: Update zynq zc702 and zc706 configs

Update zynq zc702 and zc706 RSA configs with missing
configs. These should be same as zc702 and zc706
configs except the config RSA.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
9 years agoarm: socfpga: Enable SPL_DM_SEQ_ALIAS for all SOCFPGA configs
Nathan Rossi [Thu, 7 Jan 2016 17:00:48 +0000 (03:00 +1000)] 
arm: socfpga: Enable SPL_DM_SEQ_ALIAS for all SOCFPGA configs

This feature is required in SPL to enable support for loading from SPI
flash.

Also clean up the #define in socfpga_common.h.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Acked: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin-Liang See <clsee@altera.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoarm: mvebu: Select SPL_DM_SEQ_ALIAS
Nathan Rossi [Thu, 7 Jan 2016 17:00:47 +0000 (03:00 +1000)] 
arm: mvebu: Select SPL_DM_SEQ_ALIAS

Select SPL_DM_SEQ_ALIAS which is required for certain uclasses,
specifically SPI Flash.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoarm: zynq: Enable SPL_DM_SEQ_ALIAS for all Zynq configs
Nathan Rossi [Thu, 7 Jan 2016 17:00:46 +0000 (03:00 +1000)] 
arm: zynq: Enable SPL_DM_SEQ_ALIAS for all Zynq configs

This feature is required in SPL to enable support for loading from SPI
flash when the device is booted from QSPI.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agospl: dm: Add SPL_DM_SEQ_ALIAS config option
Nathan Rossi [Thu, 7 Jan 2016 17:00:45 +0000 (03:00 +1000)] 
spl: dm: Add SPL_DM_SEQ_ALIAS config option

The Device Model sequence alias feature is required by some Uclasses.
Instead of disabling the feature for all SPL targets allow it to be
configured.

The config option is disabled by default to reduce code size for targets
that are not interested or do not require this feature.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Marek Vasut <marex@denx.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Move FLASH_BAR to Kconfig
Michal Simek [Tue, 12 Jan 2016 12:44:29 +0000 (13:44 +0100)] 
ARM: zynq: Move FLASH_BAR to Kconfig

Clean up config and use Kconfig more.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Move ZYNQ_QSPI to Kconfig
Michal Simek [Wed, 13 Jan 2016 13:08:06 +0000 (14:08 +0100)] 
ARM: zynq: Move ZYNQ_QSPI to Kconfig

And clean appropriate config headers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoARM: zynq: Do not select options if SPL is not enabled
Michal Simek [Wed, 13 Jan 2016 13:32:43 +0000 (14:32 +0100)] 
ARM: zynq: Do not select options if SPL is not enabled

Zynq setups some default options for SPL but not all targets are
enabling SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoMerge tag 'v2016.01' into xilinx/master
Michal Simek [Wed, 13 Jan 2016 12:25:03 +0000 (13:25 +0100)] 
Merge tag 'v2016.01' into xilinx/master

Prepare v2016.01

Various QSPI fixes from Siva were applied:
spi_flash: Add support for device with Quad IO support
zynq_qspi: Update parent priv data during pre probe of qspi
zynq-common: Add missing dual flash support in zynq
spi: spi_flash: Add support for generic qspi
zynqmp_qspi: Update parent priv data during pre probe of qspi
spi: spi_flash: Add 4-byte support for spi flash
spi: spi_flash: Correct flash size calculation
spi: spi_flash: Add support for Dual stacked mode

Add ifdef around CONFIG_FEC_MXC to remove compilation warnings.
Remove qspi flash enabling via defconfig. Do it later.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoPrepare v2016.01 v2016.01
Tom Rini [Tue, 12 Jan 2016 14:06:54 +0000 (09:06 -0500)] 
Prepare v2016.01

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agodm: test: usb: Update the USB tests so that they all pass
Simon Glass [Thu, 7 Jan 2016 17:23:42 +0000 (10:23 -0700)] 
dm: test: usb: Update the USB tests so that they all pass

Due to a limitation removed in an earlier patch, USB tests were not seeing
all the devices. Update the tests to pass now that all devices are visible.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agoMAINTAINERS/mailmap: Update my email address
Fabio Estevam [Mon, 11 Jan 2016 12:22:40 +0000 (10:22 -0200)] 
MAINTAINERS/mailmap: Update my email address

Update my email address to the NXP account.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
9 years agozynq: Define sys prompt for all RSA targets zc702/zc706
Michal Simek [Mon, 11 Jan 2016 10:50:53 +0000 (11:50 +0100)] 
zynq: Define sys prompt for all RSA targets zc702/zc706

Define CONFIG_SYS_PROMPT for all Zynq boards

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: Add new zc702/zc706 RSA defconfig
Michal Simek [Thu, 7 Jan 2016 08:20:18 +0000 (09:20 +0100)] 
zynq: Add new zc702/zc706 RSA defconfig

Just enable CONFIG_CMD_ZYNQ_RSA=y compare to default zc702/zc706
defconfigs.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agozynq: Define sys prompt for all Zynq boards
Siva Durga Prasad Paladugu [Mon, 11 Jan 2016 06:31:10 +0000 (12:01 +0530)] 
zynq: Define sys prompt for all Zynq boards

Define CONFIG_SYS_PROMPT 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 agofpga: xilinx: Check for substring in device ID validation
Siva Durga Prasad Paladugu [Mon, 11 Jan 2016 07:00:41 +0000 (12:30 +0530)] 
fpga: xilinx: Check for substring in device ID validation

Check for substrings in deviceID validation check
so that it can support xa bitstreams also.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agofpga: Fix compilation warnings
Michal Simek [Tue, 5 Jan 2016 12:51:48 +0000 (13:51 +0100)] 
fpga: Fix compilation warnings

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
9 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Sun, 10 Jan 2016 14:17:52 +0000 (09:17 -0500)] 
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

9 years agocgtqmx6eval: README: Fix parameter of 'sf write' command
Otavio Salvador [Thu, 7 Jan 2016 19:01:23 +0000 (17:01 -0200)] 
cgtqmx6eval: README: Fix parameter of 'sf write' command

'sf command' should receive the length in sector boundaries, so fix it
accordingly.

Also, show the steps to set the server and board IP addresses for
making the steps clearer.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
9 years agomx6cuboxi: Remove obsolete comment
Fabio Estevam [Wed, 6 Jan 2016 16:19:22 +0000 (14:19 -0200)] 
mx6cuboxi: Remove obsolete comment

We currently support various versions of Solidrun mx6 boards, so
remove the obsolete comment.

Reported-by: Jon Nettleton <jon.nettleton@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
9 years agomx6cuboxi: Fix the reset delay for the AR8035 PHY
Fabio Estevam [Mon, 4 Jan 2016 23:38:08 +0000 (21:38 -0200)] 
mx6cuboxi: Fix the reset delay for the AR8035 PHY

Since commit 59370f3fcd1350 ("net: phy: delay only if reset handler is
registered") Ethernet is no longer functional:

Booting from net ...
FEC Waiting for PHY auto negotiation to complete......... TIMEOUT !
BOOTP broadcast 1
BOOTP broadcast 2
BOOTP broadcast 3
BOOTP broadcast 4

This commit does not have an issue in itself, but it revelead a problem
with the Ethernet initialization.

As per the AR8035 datasheet:

"For a reliable power on reset, suggest to keep asserting the reset
low long enough (10ms) to ensure the clock is stable and clock-to-reset
1ms requirement is satisfied."

So do as suggested and keep the reset low for 10ms.

Also add a 100us delay after deasserting the reset line
to guarantee that the PHY ID can be read correctly and the Atheros
PHY can be loaded as per Troy Kisky's suggestion.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Tested-by: Tom Rini <trini@konsulko.com>
9 years agoMerge git://git.denx.de/u-boot-rockchip
Tom Rini [Fri, 8 Jan 2016 19:19:24 +0000 (14:19 -0500)] 
Merge git://git.denx.de/u-boot-rockchip

9 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Fri, 8 Jan 2016 15:18:18 +0000 (10:18 -0500)] 
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

9 years agopci: layerscape: Adjust the return value when ls_pcie_addr_valid() fails
Bin Meng [Fri, 8 Jan 2016 09:03:21 +0000 (01:03 -0800)] 
pci: layerscape: Adjust the return value when ls_pcie_addr_valid() fails

When trying to access non-existent/unsupported PCI devices in
ls_pcie_read_config(), when ls_pcie_addr_valid() fails it returns
error code and fills in the result with 0xffffffff manually. But it
really should return zero to upper layer codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
9 years agopci: imx: Adjust the return value when imx_pcie_addr_valid() fails
Bin Meng [Fri, 8 Jan 2016 09:03:20 +0000 (01:03 -0800)] 
pci: imx: Adjust the return value when imx_pcie_addr_valid() fails

When trying to access non-existent/unsupported PCI devices in
imx_pcie_read_config(), when imx_pcie_addr_valid() fails it returns
error code and fills in the result with 0xffffffff manually. But it
really should return zero to upper layer codes.

Reported-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
9 years agofs: handle the fileaddr variable in the same way as in the network case
David Müller (ELSOFT AG) [Fri, 8 Jan 2016 08:39:20 +0000 (09:39 +0100)] 
fs: handle the fileaddr variable in the same way as in the network case

Signed-off-by: David Müller <d.mueller@elsoft.ch>
9 years agoget_maintainer: fix perl 5.22/5.24 deprecated/incompatible "\C" use
Heiko Schocher [Thu, 7 Jan 2016 12:45:38 +0000 (13:45 +0100)] 
get_maintainer: fix perl 5.22/5.24 deprecated/incompatible "\C" use

from linux commit ce8155f7a3d5:

Perl 5.22 emits a deprecated message when "\C" is used in a regex.  Perl
5.24 will disallow it altogether.

Fix it by using [A-Z] instead of \C.

>From linux adapted to U-Boot by:
Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
9 years agofix always succesful memory test
Rasmus Villemoes [Thu, 7 Jan 2016 10:36:04 +0000 (11:36 +0100)] 
fix always succesful memory test

Since 51209b1f42cb ("Use common mtest iteration counting"),
do_mem_mtest has always reported 0 errors and hence returned 0, even
if errors were detected. Fix the helpers mem_test_alt() and
mem_test_quick() to return the number of errors found.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
9 years agocyrus: Enable STDIO deregister
Andy Fleming [Wed, 6 Jan 2016 21:34:50 +0000 (15:34 -0600)] 
cyrus: Enable STDIO deregister

If CONFIG_SYS_STDIO_DEREGISTER is not enabled, usb reset
will fail every time. Enabling it allows usb reset to
work.

Signed-off-by: Andy Fleming <afleming@gmail.com>
9 years agoMAINTAINERS, .mailmap: Update my email address
York Sun [Tue, 5 Jan 2016 17:48:45 +0000 (09:48 -0800)] 
MAINTAINERS, .mailmap: Update my email address

Change from yorksun@freescale.com to york.sun@nxp.com.

Signed-off-by: York Sun <york.sun@nxp.com>
9 years agoam33xx/am43xx: Add platform data for GPIOs
Tom Rini [Tue, 5 Jan 2016 17:17:15 +0000 (12:17 -0500)] 
am33xx/am43xx: Add platform data for GPIOs

On these platforms we have many cases of boards that enable device model
and GPIO support but do not enable OF_CONTROL and pass in a device tree
with the binary.  We need to bring in the platform data here as well.

Tested on Beaglebone Black.

Reported-by: Robert Nelson <robertcnelson@gmail.com>
Reported-by: Francisco Aguerre <franciscoaguerre@gmail.com>
Reported-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agoserial: zynq: Use static inline for _debug_uart_init()
Michal Simek [Tue, 5 Jan 2016 11:49:21 +0000 (12:49 +0100)] 
serial: zynq: Use static inline for _debug_uart_init()

Mark _debug_uart_init() as static to avoid sparse warning and
inline it to debug_uart_init().

Reported-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agonet: remove scary warning about EEPROM provided MAC address
Andre Przywara [Mon, 4 Jan 2016 15:48:22 +0000 (15:48 +0000)] 
net: remove scary warning about EEPROM provided MAC address

In many parts of the computing world having a unique MAC address
sitting in some on-NIC storage is considered the normal case.
Remove the warning to not scare the user unnecessarily.
This applies to Highbank/Midway and ARM's Juno, for instance.
Besides that this fixes the formatting on Midway, for instance,
which currently looks like:
...
Net:   xgmac0
Warning: xgmac0 using MAC address from net device
, xgmac1
Warning: xgmac1 using MAC address from net device
...

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
9 years agoarm64: Juno/FVP: adjust kernel load address
Andre Przywara [Mon, 4 Jan 2016 15:43:36 +0000 (15:43 +0000)] 
arm64: Juno/FVP: adjust kernel load address

The default kernel load offset for an arm64 kernel is 0x80000, so
U-Boot takes cares of moving the loaded kernel to a matching memory
location just before booting it.
Since we run with caches off, this takes a while for any decently
sized kernel - with no output explaining the reason for the delay
(unless one uses a DEBUG build).
By adjusting the default load offset for Juno and VFP to be 512K
aligned in the first place we can skip this copying and boot much
faster.
Tested on Juno.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
9 years agoarm, Makefile: correct compilation flag for u-boot-dtb
Aneesh Bansal [Wed, 23 Dec 2015 08:46:23 +0000 (14:16 +0530)] 
arm, Makefile: correct compilation flag for u-boot-dtb

The compilation of u-boot-dtb.img should be controlled by
CONFIG_OF_CONTROL and not CONFIG_DM.
CONFIG_DM may be defined even without Device Tree requirement.

This was added in commit 947cee1127c5fa97529c8cda4f0b48d141f92560.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
CC: Alison Wang <alison.wang@freescale.com>
9 years agobootcount: Correct #endif comment to match, other aesthetics
Robert P. J. Day [Tue, 22 Dec 2015 12:15:14 +0000 (07:15 -0500)] 
bootcount: Correct #endif comment to match, other aesthetics

Correct mismatched comment on #endif to agree with its #if defined().

Also add some missing #endif comments for consistency, take out
extraneous blank lines for readability.

rday

9 years agodoc: Tidy up first part of top-level README file
Robert P. J. Day [Sat, 19 Dec 2015 12:16:10 +0000 (07:16 -0500)] 
doc: Tidy up first part of top-level README file

First (small) pass at tidying up the README file, including:

 * remove references to obsolete CREDITS file
 * remove (some) references to obsolete boards.cfg file
 * remove at least one reference to a "scrapped" board
 * cut down unnecessarily detailed directory hierarchy
 * bunch of grammar and spelling tweaks

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
9 years agopowerpc: Various typo fixes under arch/powerpc/cpu/mpc83xx
Robert P. J. Day [Wed, 16 Dec 2015 17:25:42 +0000 (12:25 -0500)] 
powerpc: Various typo fixes under arch/powerpc/cpu/mpc83xx

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
9 years agoinclude: Correct "requset" typoes in misc.h
Robert P. J. Day [Mon, 14 Dec 2015 11:28:51 +0000 (06:28 -0500)] 
include: Correct "requset" typoes in misc.h

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
9 years agoMerge git://git.denx.de/u-boot-dm
Tom Rini [Fri, 8 Jan 2016 15:02:25 +0000 (10:02 -0500)] 
Merge git://git.denx.de/u-boot-dm

9 years agorockchip: Fix the configuration for chromebook_jerry
Simon Glass [Tue, 29 Dec 2015 12:22:45 +0000 (05:22 -0700)] 
rockchip: Fix the configuration for chromebook_jerry

Various updates did not make it through to this board. Also the instructions
for building a SPI image are no-longer correct. Fix these so that Jerry can
boot to a prompt again.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agorockchip: Drop a debug message when outputing SPI images
Simon Glass [Tue, 29 Dec 2015 12:22:44 +0000 (05:22 -0700)] 
rockchip: Drop a debug message when outputing SPI images

There is an unnecessary sector count displayed. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agorockchip: Enable generation of SPI images
Simon Glass [Tue, 29 Dec 2015 12:22:43 +0000 (05:22 -0700)] 
rockchip: Enable generation of SPI images

This feature was dropped at some point. Restore it.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agonet: Fix delay in net_retry test
Joe Hershberger [Mon, 21 Dec 2015 22:31:35 +0000 (16:31 -0600)] 
net: Fix delay in net_retry test

Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout)

Check the arp timeout and adjust the timeout start time before the call
to eth_recv() so that the sandbox driver has the opportunity to adjust
the sandbox timer after the new start time has been recorded.

Also, change the adjustment amount by 11 seconds instead of exactly the
10 seconds that the ping timout is expecting since the timeout check is
looking for the time elapsed to be greater than but not equal to the
specified delay.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: Simon Glass <sjg@chromium.org>
9 years agofdt: fix address cell count checking in fdt_translate_address()
Przemyslaw Marczak [Wed, 28 Oct 2015 14:37:57 +0000 (15:37 +0100)] 
fdt: fix address cell count checking in fdt_translate_address()

Commit: dm: core: Enable optional use of fdt_translate_address()

Enables use of this function as default, but after this it's not
possible to get dev address for the case in which: '#size-cells == 0'

This causes errors when getting address for some GPIOs, for which
the '#size-cells' is set to 0.

Example error:
'__of_translate_address: Bad cell count for gpx0'

Allowing for that case by modifying the macro 'OF_CHECK_COUNTS',
(called from )__of_translate_address(), fixes the issue.

Now, this macro doesn't check, that '#size-cells' is greater than 0.

This is possible from the specification point of view, but I'm not sure
that it doesn't introduce a regression for other configs.

Please test and share the results.

Tested-on: Odroid U3, Odroid X2, Odroid XU3, Sandbox.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
9 years agodm: usb: Add a remove() method for USB keyboards
Simon Glass [Sun, 3 Jan 2016 20:50:31 +0000 (13:50 -0700)] 
dm: usb: Add a remove() method for USB keyboards

At present USB keyboards are not properly removed with driver model. Add the
code to handle this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Thu, 7 Jan 2016 17:41:57 +0000 (12:41 -0500)] 
Merge branch 'master' of git://git.denx.de/u-boot-spi

9 years agousb: Allow up to 7 storage devices
Simon Glass [Sun, 3 Jan 2016 20:50:30 +0000 (13:50 -0700)] 
usb: Allow up to 7 storage devices

The current limit of 5 is not enough for the driver model USB tests. Really
we should not have a limit but the driver model code still uses the
usb_dev_desc[] array, which has a limit.

Increasing the limit by 2 should not bother anyone. Adjust it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
9 years agodm: Disable all SPI and SPI flash tests
Simon Glass [Sun, 3 Jan 2016 20:50:29 +0000 (13:50 -0700)] 
dm: Disable all SPI and SPI flash tests

This subsystem has been broken since commit:

  4efad20a  sf: Update status reg check in spi_flash_cmd_wait_ready

There has so far been no response from the maintainer, and a release is
imminent. For now, let's just disable the tests.

Signed-off-by: Simon Glass <sjg@chromium.org>
9 years agodm: eth: Stick to 'ethact' when 'ethrotate' is 'no' in eth_init()
Bin Meng [Tue, 22 Dec 2015 06:43:39 +0000 (22:43 -0800)] 
dm: eth: Stick to 'ethact' when 'ethrotate' is 'no' in eth_init()

When 'ethrotate' variable is set to 'no' and 'ethact' variable
is already set to an ethernet device, we should stick to 'ethact'.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
9 years agodm: eth: Test 'ethrotate' before changing current ethernet device
Bin Meng [Tue, 22 Dec 2015 06:43:38 +0000 (22:43 -0800)] 
dm: eth: Test 'ethrotate' before changing current ethernet device

In eth_current_changed(), the call to eth_get_dev() below has a side
effect of rotating ethernet device if uc_priv->current == NULL. This
is not what we want when 'ethrotate' variable is 'no'.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
9 years agotest: add sandbox timer to test.dts
Thomas Chou [Fri, 11 Dec 2015 08:27:34 +0000 (16:27 +0800)] 
test: add sandbox timer to test.dts

Add missing sandbox timer to test.dts, so that test-dm works.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
9 years agoimx_watchdog: always set minimal timeout in reset_cpu
Andrey Skvortsov [Sun, 20 Dec 2015 18:09:58 +0000 (21:09 +0300)] 
imx_watchdog: always set minimal timeout in reset_cpu

The problem is that timeout bits in WCR register were leaved unchanged.
So previously set timeout value was applied and therefore 'reset'
command takes any value up to two minutes, depending on previous
watchdog settings, instead of minimal 0.5 seconds.

Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>