]> git.ipfire.org Git - people/ms/u-boot.git/log
people/ms/u-boot.git
7 years agoimx6: icorem6: Add I2C support
Jagan Teki [Mon, 5 Dec 2016 23:01:00 +0000 (00:01 +0100)] 
imx6: icorem6: Add I2C support

Add I2C support for Engicam i.CoreM6 qdl board.

icorem6qdl> i2c bus
Bus 0:  i2c@021a0000
Bus 1:  i2c@021a4000
Bus 2:  i2c@021a8000
icorem6qdl> i2c dev 2
Setting bus to 2
icorem6qdl> i2c speed 100000
Setting bus speed to 100000 Hz
icorem6qdl> i2c probe
Valid chip addresses: 2C
icorem6qdl> i2c md 2C 0xff
00ff: 00 00 00 00 0f f0 01 64 ff ff 00 00 00 00 00 00    .......d........

Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoi2c: mxc: Make 'no gpio pinctrl state' print as debug
Jagan Teki [Mon, 5 Dec 2016 23:00:59 +0000 (00:00 +0100)] 
i2c: mxc: Make 'no gpio pinctrl state' print as debug

Some I2C bus devicetree nodes, doesn't require to have
gpio pinctrl so replace the dev_info to debug so the
print never comes on the console and for bus that uses
gpio pinctrl anyway have dev_err.

Before:
------
U-Boot> i2c dev 1
Setting bus to 1
i2c bus 1 at 0x21a4000, no gpio pinctrl state.

After:
------
U-Boot> i2c dev 1
Setting bus to 1

Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoi2c: mxc: Print hex instead of decimal for bus address
Jagan Teki [Mon, 5 Dec 2016 23:00:58 +0000 (00:00 +0100)] 
i2c: mxc: Print hex instead of decimal for bus address

Better to print the hex value for bus address instead of
decimal, for more readbility on bus addressing.

Before:
------
U-Boot> i2c dev 1
Setting bus to 1
i2c bus 1 at 35274752, no gpio pinctrl state.

After:
------
U-Boot> i2c dev 1
Setting bus to 1
i2c bus 1 at 0x21a4000, no gpio pinctrl state.

Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Heiko Schocher <hs@denx.de>
7 years agoi2c: Kconfig: Add SYS_I2C_MXC entry
Jagan Teki [Mon, 5 Dec 2016 23:00:57 +0000 (00:00 +0100)] 
i2c: Kconfig: Add SYS_I2C_MXC entry

Added kconfig for SYS_I2C_MXC driver.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agoimx6: icorem6: Add custom splashscreen support
Jagan Teki [Mon, 5 Dec 2016 23:00:56 +0000 (00:00 +0100)] 
imx6: icorem6: Add custom splashscreen support

Add custom splashscreen, engicam.bmp support for
Engicam i.CoreM6 qdl board.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agoimx6: icorem6: Add framebuffer support
Jagan Teki [Mon, 5 Dec 2016 23:00:55 +0000 (00:00 +0100)] 
imx6: icorem6: Add framebuffer support

Add IPUv3 framebuffer support for Engicam i.CoreM6 qdl board.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agovideo: Kconfig: Add VIDEO_IPV3 entry
Jagan Teki [Mon, 5 Dec 2016 23:00:54 +0000 (00:00 +0100)] 
video: Kconfig: Add VIDEO_IPV3 entry

Added kconfig entry for CONFIG_VIDEO_IPV3 driver.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agoicorem6: Use CONFIG_DM_ETH support
Jagan Teki [Mon, 5 Dec 2016 23:00:53 +0000 (00:00 +0100)] 
icorem6: Use CONFIG_DM_ETH support

Use CONFIG_DM_ETH and remove board_eth_init code
from board files.

Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agoARM: dts: imx6qdl-icore: Add FEC support
Jagan Teki [Mon, 5 Dec 2016 23:00:52 +0000 (00:00 +0100)] 
ARM: dts: imx6qdl-icore: Add FEC support

Add FEC dts support for Engicam i.CoreM6 dql modules.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agodm: net: fec: Add .read_rom_hwaddr
Jagan Teki [Mon, 5 Dec 2016 23:00:51 +0000 (00:00 +0100)] 
dm: net: fec: Add .read_rom_hwaddr

Add .read_rom_hwaddr on dm eth_ops.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agonet: fec_mxc: Driver cleanups
Jagan Teki [Mon, 5 Dec 2016 23:00:50 +0000 (00:00 +0100)] 
net: fec_mxc: Driver cleanups

- Remove exctra space
- Add space
- Add tab space
- Fix single line comments quotes
- Fix 'CHECK: Avoid CamelCase'
- Fix 'CHECK: Alignment should match open parenthesis'
- Fix 'WARNING: line over 80 characters'
- Re-arrage header include files

Cc: Simon Glass <sjg@chromium.org>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agonet: fec_mxc: Convert into driver model
Jagan Teki [Mon, 5 Dec 2016 23:00:49 +0000 (00:00 +0100)] 
net: fec_mxc: Convert into driver model

This patch add driver model support for fec_mxc driver.

Cc: Simon Glass <sjg@chromium.org>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agonet: fec_mxc: Remove unneeded eth_device arg from fec_get_hwaddr
Jagan Teki [Mon, 5 Dec 2016 23:00:48 +0000 (00:00 +0100)] 
net: fec_mxc: Remove unneeded eth_device arg from fec_get_hwaddr

fec_get_hwaddr never used eth_device argument, hence removed.

Cc: Simon Glass <sjg@chromium.org>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
7 years agoarm: imx: add i.MX53 Beckhoff CX9020 Embedded PC
Patrick Bruenn [Fri, 4 Nov 2016 10:57:02 +0000 (11:57 +0100)] 
arm: imx: add i.MX53 Beckhoff CX9020 Embedded PC

Add CX9020 board based on mx53loco.
Add simplified imx53 base device tree from kernel v4.8-rc8, to reuse
serial_mxc with DTE and prepare for device tree migration of other
functions and imx53 devices.

The CX9020 differs from i.MX53 Quick Start Board by:
- use uart2 instead of uart1
- DVI-D connector instead of VGA
- no audio
- CCAT FPGA connected to emi
- enable rtc

Signed-off-by: Patrick Bruenn <p.bruenn@beckhoff.com>
7 years agoimx: mx6sllevk: add plugin support
Peng Fan [Sun, 11 Dec 2016 11:24:38 +0000 (19:24 +0800)] 
imx: mx6sllevk: add plugin support

Add plugin support for mx6sllevk board.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoarm: imx: add i.MX6SLL EVK board support
Peng Fan [Sun, 11 Dec 2016 11:24:37 +0000 (19:24 +0800)] 
arm: imx: add i.MX6SLL EVK board support

Add i.MX6SLL EVK board support.
1. Add imx6sll-evk device tree.
2. Enable SDHC/I2C/UART.
3. Enable REGULATOR/PMIC/I2C/GPIO/SDHC/PINCTRL driver.

Boot Log:
U-Boot 2016.11-00127-gc635871-dirty (Nov 24 2016 - 13:28:19 +0800)

CPU:   Freescale i.MX6SLL rev1.0 at 792MHz
CPU:   Commercial temperature grade (0C to 95C)Reset cause: POR
Model: Freescale i.MX6SLL EVK Board
Board: MX6SLL EVK
DRAM:  2 GiB
i2c bus 0 at 35258368, no gpio pinctrl state.
PMIC: PFUZE100! DEV_ID=0x10 REV_ID=0x21
MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
In:    serial
Out:   serial
Err:   serial
Net:   CPU Net Initialization Failed
No ethernet found.
Hit any key to stop autoboot:  0

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoarm: dts: add i.MX6SLL device tree
Peng Fan [Sun, 11 Dec 2016 11:24:36 +0000 (19:24 +0800)] 
arm: dts: add i.MX6SLL device tree

Add i.MX6SLL device tree.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agopinctrl: imx6: support i.MX6SLL
Peng Fan [Sun, 11 Dec 2016 11:24:35 +0000 (19:24 +0800)] 
pinctrl: imx6: support i.MX6SLL

There two iomuxc for i.MX6SLL. One is normal IOMUXC, the other
is for IOMUXC_SNVS.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agoimx-common: lcdif: update lcdif regs for i.MX6SL/SLL
Peng Fan [Sun, 11 Dec 2016 11:24:34 +0000 (19:24 +0800)] 
imx-common: lcdif: update lcdif regs for i.MX6SL/SLL

Update lcdif regs for i.MX6SL/SLL

Signed-off-by: Ye.Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
7 years agoOCOTP: Update OCOTP driver to support i.MX6SLL
Peng Fan [Sun, 11 Dec 2016 11:24:33 +0000 (19:24 +0800)] 
OCOTP: Update OCOTP driver to support i.MX6SLL

Add the i.MX6SLL support to OCOTP driver.

The i.MX6SLL reuses the i.MX6ULL fuse, bank 7 and bank8 have 4 words
each, and there is a hole between bank 5 and bank 6.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
7 years agomx6_common: correct loadaddr and text base for i.MX6SLL
Peng Fan [Sun, 11 Dec 2016 11:24:32 +0000 (19:24 +0800)] 
mx6_common: correct loadaddr and text base for i.MX6SLL

Correct loadaddr and text base for i.MX6SLL

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sll: add Kconfig entry for i.MX6SLL
Peng Fan [Sun, 11 Dec 2016 11:24:31 +0000 (19:24 +0800)] 
imx: mx6sll: add Kconfig entry for i.MX6SLL

add Kconfig entry for i.MX6SLL

Signed-off-by: Peng Fan <peng.fan@nxp.com>
7 years agoimx-common: cache: configure L2 Cache for i.MX6SLL
Peng Fan [Sun, 11 Dec 2016 11:24:30 +0000 (19:24 +0800)] 
imx-common: cache: configure L2 Cache for i.MX6SLL

If L2 cache configured as OCRAM, reset it.
Switch to use runtime check.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sll: add clock support
Peng Fan [Sun, 11 Dec 2016 11:24:29 +0000 (19:24 +0800)] 
imx: mx6sll: add clock support

Add clock support for i.MX6SLL.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: clock: gate clk before changing pix clk mux
Peng Fan [Sun, 11 Dec 2016 11:24:28 +0000 (19:24 +0800)] 
imx: clock: gate clk before changing pix clk mux

The LCDIF Pixel clock mux is not glitchless, so need
to gate before changing mux.

Also change enable_lcdif_clock prototype with a new input
parameter to indicate disable or enable.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sl: add lcdif clock support
Peng Fan [Sun, 11 Dec 2016 11:24:27 +0000 (19:24 +0800)] 
imx: mx6sl: add lcdif clock support

Add lcdif clock support for i.MX6SL.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
7 years agoimx: mx6: lcdif: gate clock before changing mux
Peng Fan [Sun, 11 Dec 2016 11:24:26 +0000 (19:24 +0800)] 
imx: mx6: lcdif: gate clock before changing mux

The mux for the lcd clock is not glitchless,
so need to first gate the clock before changing the mux.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6: fix mmdc ch0 clk for 6SL
Peng Fan [Sun, 11 Dec 2016 11:24:25 +0000 (19:24 +0800)] 
imx: mx6: fix mmdc ch0 clk for 6SL

>From RM, per_periph2_clk_sel option3 is:
"derive clock from 198MHz clock (divided 392MHz PLL2 PFD)."

So fix it.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sll: add iomux settings
Peng Fan [Sun, 11 Dec 2016 11:24:24 +0000 (19:24 +0800)] 
imx: mx6sll: add iomux settings

Add iomux settings for i.MX6 SLL

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye.Li <ye.li@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx-common: timer: add i.MX6SLL support
Peng Fan [Sun, 11 Dec 2016 11:24:23 +0000 (19:24 +0800)] 
imx-common: timer: add i.MX6SLL support

Add i.MX6 SLL GPT timer support.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sll: update register address
Peng Fan [Sun, 11 Dec 2016 11:24:22 +0000 (19:24 +0800)] 
imx: mx6sll: update register address

Update register address for i.MX6 SLL

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: mx6sll: add pinmux header files
Peng Fan [Sun, 11 Dec 2016 11:24:21 +0000 (19:24 +0800)] 
imx: mx6sll: add pinmux header files

Add i.MX6SLL pinmux header files

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoimx: add i.MX 6SLL CPU type
Peng Fan [Sun, 11 Dec 2016 11:24:20 +0000 (19:24 +0800)] 
imx: add i.MX 6SLL CPU type

Add i.MX6SLL cpu type.
MXC_CPU_MX6D is not a real value in chip, so change it to 0x6A.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
7 years agoconfigs: colibri_vf: Add fdt_fixup environment variable
Sanchayan Maity [Fri, 2 Dec 2016 08:58:27 +0000 (14:28 +0530)] 
configs: colibri_vf: Add fdt_fixup environment variable

u-boot allows modifying a device tree after it is loaded into
memory. Add fdt_fixup hook in u-boot environment which can
facilitate such modifications.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
7 years agoboard/liteboard: Add support for liteBoard
Marcin Niestroj [Wed, 7 Dec 2016 15:46:33 +0000 (16:46 +0100)] 
board/liteboard: Add support for liteBoard

liteBoard is a development board which uses liteSOM as its base.

Hardware specification:
 * liteSOM (i.MX6UL, DRAM, eMMC)
 * Ethernet PHY (id 0)
 * USB host (usb_otg1)
 * MicroSD slot (uSDHC1)

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
7 years agoARM: imx6ul: Add support for liteSOM
Marcin Niestroj [Wed, 7 Dec 2016 15:46:32 +0000 (16:46 +0100)] 
ARM: imx6ul: Add support for liteSOM

liteSOM is a System On Module (http://grinn-global.com/litesom/). It
can't exists on its own, but will be used as part of other boards.

Hardware specification:
 * NXP i.MX6UL processor
 * 256M or 512M DDR3 memory
 * optional eMMC (uSDHC2)

Here we treat SOM similar to SOC, so we place it inside arch/arm/mach-*
directory and make it possible to reuse initialization code (i.e. DDR,
eMMC init) for all boards that use it.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
7 years agoudoo_neo: Add Ethernet support
Breno Lima [Tue, 6 Dec 2016 17:38:26 +0000 (15:38 -0200)] 
udoo_neo: Add Ethernet support

UDOO Neo boards has one FEC port connected to KSZ8091, add support for it.

Tested on a UDOO Neo Full with "dhcp zImage" command.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
7 years agoudoo_neo: Add PFUZE300 PMIC support
Breno Lima [Tue, 6 Dec 2016 17:38:25 +0000 (15:38 -0200)] 
udoo_neo: Add PFUZE300 PMIC support

UDOO Neo boards has a PFUZE300 connected to I2C1 bus.

Tested on a UDOO Neo Full with "pmic PFUZE3000 dump" command.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
7 years agopower: pmic: Add Voltage configuration macro
Breno Lima [Tue, 6 Dec 2016 17:38:24 +0000 (15:38 -0200)] 
power: pmic: Add Voltage configuration macro

Add pfuze3000 voltage configuration macro for SW1AB, SW3 and VLDO1/2 according
to tables 53, 57 and 62 on PF3000 datasheet.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
7 years agoudoo_neo: Add thermal support
Breno Lima [Thu, 1 Dec 2016 18:37:41 +0000 (16:37 -0200)] 
udoo_neo: Add thermal support

Add thermal support on the Kconfig file.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo_neo: Remove console option
Breno Lima [Thu, 1 Dec 2016 18:37:40 +0000 (16:37 -0200)] 
udoo_neo: Remove console option

It's not necessary to define the console option as we use the distro config.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo_neo: Remove mmcautodetect option
Breno Lima [Thu, 1 Dec 2016 18:37:39 +0000 (16:37 -0200)] 
udoo_neo: Remove mmcautodetect option

It's not necessary to define the mmcautodetect as it is not used anywhere.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo_neo: Staticize board_string()
Breno Lima [Thu, 1 Dec 2016 18:37:38 +0000 (16:37 -0200)] 
udoo_neo: Staticize board_string()

Change board_string() function to static because it's being used locally.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo_neo: Move MX6SX configuration to Kconfig
Breno Lima [Thu, 1 Dec 2016 18:37:37 +0000 (16:37 -0200)] 
udoo_neo: Move MX6SX configuration to Kconfig

It's not necessary to define the processor in the defconfig file.

The preferred method to select the SoC is via Kconfig file.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoudoo_neo: Remove USDHC3 support
Breno Lima [Thu, 1 Dec 2016 18:37:36 +0000 (16:37 -0200)] 
udoo_neo: Remove USDHC3 support

It's not necessary to support USDHC3 in U-Boot as it's being used for
the WLAN.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
7 years agoarm: imx: initial support for colibri imx6
Max Krummenacher [Wed, 30 Nov 2016 18:43:09 +0000 (19:43 +0100)] 
arm: imx: initial support for colibri imx6

This adds board support for the Toradex module family Colibri iMX6.
The familiy consists of a module with i.MX6 DualLite, i.MX6 Solo, both
with a version for commercial and industrial temperature range.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
7 years agoarm: imx: initial support for apalis imx6
Max Krummenacher [Wed, 30 Nov 2016 18:43:08 +0000 (19:43 +0100)] 
arm: imx: initial support for apalis imx6

This adds board support for the Toradex module family Apalis iMX6.
The familiy consists of a module with i.MX6 Dual, i.MX6 Quad with
commercial and industrial temperature range.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
7 years agoARM: dts: vf: Fix warning about missing reg property
Stefan Agner [Wed, 30 Nov 2016 21:41:57 +0000 (13:41 -0800)] 
ARM: dts: vf: Fix warning about missing reg property

Add proper reg values for the two AIPS bus nodes. This avoids this
two warnings:
Node /soc/aips-bus@40000000 has a unit name, but no reg property
Node /soc/aips-bus@40080000 has a unit name, but no reg property

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agocolibri_vf: use same NAND clock as Linux uses
Stefan Agner [Wed, 30 Nov 2016 21:41:56 +0000 (13:41 -0800)] 
colibri_vf: use same NAND clock as Linux uses

Currently a divider of 6 has been used, leading to following NAND
Flash Controller (NFC) clocks:
VF61: 27.7 MHz (166.7MHz bus clock)
VF50: 22 MHz (132MHz bus clock)

The NAND Flash Memory used on VF50 allows to use clock speed of
up to 33MHz, while the Flash Memory of VF61 allows 50MHz. We can
use the same divider of 4 on both modules to configure the maximal
possible clock speeds:
VF61: 41.7 MHz
VF50: 33 MHz

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agocolibri_vf: cleanup USB clock initialization
Stefan Agner [Wed, 30 Nov 2016 21:41:55 +0000 (13:41 -0800)] 
colibri_vf: cleanup USB clock initialization

Use the same preprocessor define to enable clocks as we use to
enable the driver. Make sure that the necessary PLL's are on
(they get enabled by boot ROM by default, so this is more for
completness).

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agocolibri_vf: use device-tree for MTD partitions
Stefan Agner [Wed, 30 Nov 2016 21:41:54 +0000 (13:41 -0800)] 
colibri_vf: use device-tree for MTD partitions

Use device-tree fixup to communicate the MTD partitions to the
kernel. U-Boot's mtdparts environment variable will be used as
partition source for the device-tree based partition table too.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agotoradex: allow custom fdt board setup in board file
Stefan Agner [Wed, 30 Nov 2016 21:41:53 +0000 (13:41 -0800)] 
toradex: allow custom fdt board setup in board file

The config block support currently uses the ft_board_setup function
to patch the device tree with config block information. However, this
does not allow to patch the device tree with board specific information.
Rename the common setup function to ft_common_board_setup and use the
call it from the board files directly.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agotoradex: fix USB Download gadget fixup callback
Stefan Agner [Wed, 30 Nov 2016 21:41:52 +0000 (13:41 -0800)] 
toradex: fix USB Download gadget fixup callback

Use the proper config option to guard the USB Download Function
fixup callback.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
7 years agoMerge branch 'master' of git://git.denx.de/u-boot
Stefano Babic [Fri, 16 Dec 2016 08:53:52 +0000 (09:53 +0100)] 
Merge branch 'master' of git://git.denx.de/u-boot

7 years agoMAINTAINERS: DFU: Change e-mail address for DFU maintainer
Lukasz Majewski [Mon, 12 Dec 2016 16:07:07 +0000 (17:07 +0100)] 
MAINTAINERS: DFU: Change e-mail address for DFU maintainer

Despite I leave Samsung by the end of the year, I'm going to maintain DFU
in u-boot.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
7 years agoMAINTAINERS: ONENAND: MTD: Mark Samsung's OneNAND as orphaned
Lukasz Majewski [Mon, 12 Dec 2016 15:18:30 +0000 (16:18 +0100)] 
MAINTAINERS: ONENAND: MTD: Mark Samsung's OneNAND as orphaned

Since I leave Samsung by the end of the year, I will not have access to
OneNAND devices anymore.

Hence the custodian position has been marked as "Orphaned".

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
7 years agoMerge git://www.denx.de/git/u-boot-marvell
Tom Rini [Mon, 12 Dec 2016 12:19:28 +0000 (07:19 -0500)] 
Merge git://www.denx.de/git/u-boot-marvell

7 years agoMerge branch 'master' of git://git.denx.de/u-boot-uniphier
Tom Rini [Mon, 12 Dec 2016 12:18:53 +0000 (07:18 -0500)] 
Merge branch 'master' of git://git.denx.de/u-boot-uniphier

7 years agoarm64: mvebu: Enable hush parser in A8K default configuration
Konstantin Porotchkin [Sun, 4 Dec 2016 16:34:15 +0000 (18:34 +0200)] 
arm64: mvebu: Enable hush parser in A8K default configuration

Enable hush parser in Armada-7040 and Armada-8040 DB default
configurations.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Enable PCIe support in Armada-7040 configuration
Konstantin Porotchkin [Sun, 4 Dec 2016 16:34:14 +0000 (18:34 +0200)] 
arm64: mvebu: Enable PCIe support in Armada-7040 configuration

Enable PCIe bus support in Armada-7040 DB default configuration

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Add L3 cache flush functionality to A8K family
Konstantin Porotchkin [Sun, 4 Dec 2016 16:34:13 +0000 (18:34 +0200)] 
arm64: mvebu: Add L3 cache flush functionality to A8K family

Add missing L3 cache flush functionality which absence prevents
Linux kernel from normal boot in case the L3 cache is enabled
by ATF.
The L3 cache is named the "last level" cache in order to keep
the terminology similar to the ATF code.
This cache should not be disabled by u-boot since the Linux
kernel cannot activate it, so it is activates at ATF stage.
However the cache flush is required for preventing data corruption
after disabling the MMU and the data cache before passing control
to the loaded Linux image.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Enable pin control support in A8K default config
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:32 +0000 (12:22 +0200)] 
arm64: mvebu: Enable pin control support in A8K default config

Enable mvebu pin control support in the default configuration
files for Armada-7040 and Armada-8040 development boards

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Enable BUBT command support in A8K default config
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:31 +0000 (12:22 +0200)] 
arm64: mvebu: Enable BUBT command support in A8K default config

Enable mvebu "bubt" command support in the default configuration
file for Armada-7040 and Armada-8040 development boards

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Add pin control nodes to A8K family DTS files
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:30 +0000 (12:22 +0200)] 
arm64: mvebu: Add pin control nodes to A8K family DTS files

Add pin control nodes to APN806, CP-master, CP-slave and
Armada-7040 and Armada-8040 boards DTS files

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: pinctrl: Add pin control driver for A8K family
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:29 +0000 (12:22 +0200)] 
arm64: mvebu: pinctrl: Add pin control driver for A8K family

Add a DM port of Marvell pin control driver.
The A8K SoC family contains several silicone dies interconnected
in a single package. Every die is normally equipped with its own
pin controller unit.
There are 2 pin controllers in A70x0 SoC and 3 in A80x0 SoC.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Add bubt command for flash image burn
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:28 +0000 (12:22 +0200)] 
arm64: mvebu: Add bubt command for flash image burn

Add support for mvebu bubt command for flash image
load, check and burn on boot device.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoarm64: mvebu: Modify the A8K SPI and I2C config in DTS
Konstantin Porotchkin [Thu, 8 Dec 2016 10:22:27 +0000 (12:22 +0200)] 
arm64: mvebu: Modify the A8K SPI and I2C config in DTS

Align the Armada-8040-db and Armada-7040-db SPI and I2C
DTS settings with latest DB settings:
- 8040-db: disable i2c0 and spi0 on AP (MPPs are reserved for SDIO)
- 8040-db: disable cps_i2c0 on CP1
- 8040-db: enable spi1 on CP1 (the new location of the boot flash)
  The spi1 on CP1 is aliased as spi0 since this is the way
  the driver enumerates it.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
7 years agoARM: uniphier: remove BLK select
Masahiro Yamada [Sat, 10 Dec 2016 01:52:25 +0000 (10:52 +0900)] 
ARM: uniphier: remove BLK select

This is a user configurable option, but "select BLK" forces users to
enable it.

Even with this commit, BLK is still enabled by "default y if DM_MMC"
for UniPhier SoCs; the difference is users can disable it if they
do not need it.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: dts: uniphier: sync Device Tree with Linux
Masahiro Yamada [Mon, 5 Dec 2016 09:31:39 +0000 (18:31 +0900)] 
ARM: dts: uniphier: sync Device Tree with Linux

Sync with the latest kernel.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoimgtec: Update MAINTAINERS for more config files
Tom Rini [Fri, 9 Dec 2016 14:28:37 +0000 (09:28 -0500)] 
imgtec: Update MAINTAINERS for more config files

Cover all of the boston and malta variations.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agoarm: am33xx: Initialize EMIF REG_PR_OLD_COUNT for BBB and am335x-evm
Jyri Sarha [Fri, 9 Dec 2016 10:29:13 +0000 (12:29 +0200)] 
arm: am33xx: Initialize EMIF REG_PR_OLD_COUNT for BBB and am335x-evm

Initialize EMIF OCP_CONFIG registers REG_COS_COUNT_1, REG_COS_COUNT_2,
and REG_PR_OLD_COUNT field for Beaglebone-Black and am335x-evm. With
the default values LCDC suffers from DMA FIFO underflows and frame
synchronization lost errors. The initialization values are the highest
that work flawlessly when heavy memory load is generated by CPU. 32bpp
colors were used in the test. On BBB the video mode used 110MHz pixel
clock. The mode supported by the panel of am335x-evm uses 30MHz pixel
clock.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agocalimain: Update maintainers and their email addresses
Christian Riesch [Thu, 8 Dec 2016 22:56:37 +0000 (23:56 +0100)] 
calimain: Update maintainers and their email addresses

Signed-off-by: Christian Riesch <christian@riesch.at>
Cc: Manfred Rudigier <manfred.rudigier@omicronenergy.com>
Cc: Christoph RĂ¼disser <christoph.ruedisser@omicronenergy.com>
7 years agoARM: uniphier: disable CONFIG_ARCH_FIXUP_FDT_MEMORY
Masahiro Yamada [Mon, 5 Dec 2016 09:31:38 +0000 (18:31 +0900)] 
ARM: uniphier: disable CONFIG_ARCH_FIXUP_FDT_MEMORY

Do not overwrite the memory nodes in the kernel DT where some parts
of the memory region might be carved out.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: remove unneeded parentheses
Masahiro Yamada [Mon, 5 Dec 2016 09:31:37 +0000 (18:31 +0900)] 
ARM: uniphier: remove unneeded parentheses

Just a cosmetic cleanup.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agoARM: uniphier: remove unneeded initializer
Masahiro Yamada [Mon, 5 Dec 2016 09:31:36 +0000 (18:31 +0900)] 
ARM: uniphier: remove unneeded initializer

This will be used to store the return value of readl().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
7 years agotravis-ci: Switch to building QEMU
Tom Rini [Wed, 7 Dec 2016 16:20:40 +0000 (11:20 -0500)] 
travis-ci: Switch to building QEMU

First, there are a number of features in newer QEMU that will allow us
to test a wider range of platforms, so we want to use at least v2.8.0.
Second, making use of a PPA for QEMU fails from time to time.  So we
change to checking out and building a copy of QEMU when we know that we
are going to use test.py and need QEMU to be installed.  This adds
around 4 minutes per test.py job that we run.

Signed-off-by: Tom Rini <trini@konsulko.com>
7 years agotools: mkimage: Use fstat instead of stat to avoid malicious hacks
Michal Simek [Tue, 6 Dec 2016 16:17:01 +0000 (17:17 +0100)] 
tools: mkimage: Use fstat instead of stat to avoid malicious hacks

The patch is fixing:
"tools: mkimage: Check if file is regular file"
(sha1: 56c7e8015509312240b1ee15f2ff74510939a45d)
which contains two issues reported by Coverity
Unchecked return value from stat and incorrect calling sequence where
attack can happen between calling stat and fopen.
Using pair in opposite order (fopen and fstat) is fixing this issue
because fstat is using the same file descriptor (FILE *).

Also fixing issue with:
"tools: mkimage: Add support for initialization table for Zynq and
ZynqMP" (sha1: 3b6460809c2a28360029c1c48247648fac4455c9)
where file wasn't checked that it is regular file.

Reported-by: Coverity (CID: 154711, 154712)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodavinci: omapl138_lcdk: boot from zImage
Fabien Parent [Tue, 6 Dec 2016 14:45:09 +0000 (15:45 +0100)] 
davinci: omapl138_lcdk: boot from zImage

Stop booting legacy uImage and now boot zImage.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodefconfigs: am57xx_hs_evm: Add default OPTEE load address
Andrew F. Davis [Mon, 5 Dec 2016 22:21:26 +0000 (16:21 -0600)] 
defconfigs: am57xx_hs_evm: Add default OPTEE load address

Currently we let U-Boot find a spot at the end of DRAM at runtime, this
forces us to build an OPTEE image based on the size of DRAM for an EVM.
Add a default address that works across all current AM57xx EVMs.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodefconfigs: dra7xx_hs_evm: Add default OPTEE load address
Andrew F. Davis [Mon, 5 Dec 2016 22:21:25 +0000 (16:21 -0600)] 
defconfigs: dra7xx_hs_evm: Add default OPTEE load address

Currently we let U-Boot find a spot at the end of DRAM at runtime, this
forces us to build an OPTEE image based on the size of DRAM for an EVM.
Add a default address that works across all current DRA7xx EVMs.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodavinci: omapl138_lcdk: fix bad NAND ECC config
Fabien Parent [Mon, 5 Dec 2016 18:15:21 +0000 (19:15 +0100)] 
davinci: omapl138_lcdk: fix bad NAND ECC config

The configuration used to error correction was not in line with what
linux and the ROM code is using. Fix it by using the correct
configuration. Now u-boot and the SPL are able to read correctly
anything written by them.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agodavinci: omapl138_lcdk: increase u-boot load size
Fabien Parent [Mon, 5 Dec 2016 18:15:20 +0000 (19:15 +0100)] 
davinci: omapl138_lcdk: increase u-boot load size

A size of 0x200 seems way too short for u-boot. Increase the size
to 512k.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agocmd: pci: add option to parse and display BAR information
Yehuda Yitschak [Thu, 1 Dec 2016 15:14:18 +0000 (17:14 +0200)] 
cmd: pci: add option to parse and display BAR information

Currently the PCI command only allows to see the BAR register
values but not the size and actual base address.
This little extension parses the BAR registers and displays
the base, size and type of each BAR.

Signed-off-by: Yehuda Yitschak <yehuday@marvell.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
7 years agospl: sandbox: Drop spl_board_announce_boot_device()
Simon Glass [Wed, 30 Nov 2016 22:30:56 +0000 (15:30 -0700)] 
spl: sandbox: Drop spl_board_announce_boot_device()

This function is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: uniphier: Drop spl_board_announce_boot_device()
Simon Glass [Wed, 30 Nov 2016 22:30:55 +0000 (15:30 -0700)] 
spl: uniphier: Drop spl_board_announce_boot_device()

This function is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: sunxi: Drop spl_board_announce_boot_device()
Simon Glass [Wed, 30 Nov 2016 22:30:54 +0000 (15:30 -0700)] 
spl: sunxi: Drop spl_board_announce_boot_device()

This function is not used anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: Drop announce_boot_device()
Simon Glass [Wed, 30 Nov 2016 22:30:53 +0000 (15:30 -0700)] 
spl: Drop announce_boot_device()

This task can be handled by inline code now. Drop this function.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: Pass the loader into spl_load_image()
Simon Glass [Wed, 30 Nov 2016 22:30:52 +0000 (15:30 -0700)] 
spl: Pass the loader into spl_load_image()

Rather than have this function figure out the correct loader again, pass
it in as a parameter.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: Move the loading code into its own function
Simon Glass [Wed, 30 Nov 2016 22:30:51 +0000 (15:30 -0700)] 
spl: Move the loading code into its own function

Create a boot_from_devices() function to handle trying each device. This
helps to reduce the size of the already-large board_init_r() function.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: Add a name to the SPL load-image methods
Simon Glass [Wed, 30 Nov 2016 22:30:50 +0000 (15:30 -0700)] 
spl: Add a name to the SPL load-image methods

It is useful to name each method so that we can print out this name when
using the method. Currently this happens using a separate function. In
preparation for unifying this, add a name to each method.

The name is only available if we have libcommon support (i.e can use
printf()).

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agospl: Use a single underscore in the SPL_LOAD_IMAGE_METHOD() macro
Simon Glass [Wed, 30 Nov 2016 22:30:49 +0000 (15:30 -0700)] 
spl: Use a single underscore in the SPL_LOAD_IMAGE_METHOD() macro

A double underscore is normally reserved for compiler predefines. Use a
single underscore instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
7 years agoam57xx: Set tps659038 PMIC GPIO7 pad mux value to POWERHOLD
Keerthy [Wed, 30 Nov 2016 09:32:53 +0000 (15:02 +0530)] 
am57xx: Set tps659038 PMIC GPIO7 pad mux value to POWERHOLD

The GPIO7 pad mux should be programmed to POWERHOLD value
as per board design. In cases where the PMIC is shut off the
mux is set to GPIO7 mode. So during initialization to be on the
safer side set the mode to POWERHOLD.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoconfigs: omap5_uevm_defconfig: Enable LPAE mode
Keerthy [Wed, 30 Nov 2016 09:31:57 +0000 (15:01 +0530)] 
configs: omap5_uevm_defconfig: Enable LPAE mode

Enable Linear Physical Address Extension mode which is a
prerequisite for hypervisor mode.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
7 years agoarm: armv7: add us timer for bootstage
Patrick Delaunay [Tue, 22 Nov 2016 16:31:33 +0000 (17:31 +0100)] 
arm: armv7: add us timer for bootstage

solve issue when bootstage is used with armV7 generic timer
first call of timer_get_boot_us() use the function get_timer()
before timer initialization (arch.timer_rate_hz = 0)
=> div by 0

Commit-notes

When I activate bootstage on ARMV7 architecture with platform
using the generic armv7 timer defined in file
./arch/arm/cpu/armv7m/timer.c

I have a issue because gd->arch.timer_rate_hz = 0

For me the get_timer() function should not used before timer_init
(which initialize gd->arch.timer_rate_hz) at least for the ARMV7
timer.

But in the init sequence, the first bootstage fucntion is called
before timer_init and this function use the timer function.

For me it is a error in the generic init sequence :
mark_bootstage is called before timer_init.

static init_fnc_t init_sequence_f[] = {
....
    arch_cpu_init_dm,
    mark_bootstage,        /* need timer, go after init dm */
...
#if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
        defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32) || \
        defined(CONFIG_SPARC)
    timer_init,        /* initialize timer */
#endif
.......

To solve the issue for all the paltform, we can move timer_init()
call just before mark_bootstage() in this array...

It should be ok for ARMV7 but I don't sure for other platform
impacted
- the other ARM platform or ARMV7 wich don't use generic timer
- MIPS BLACKFIN NDS32 or SPARC

and I don't sure of impact for other function called
(board_early_init_f for example....)

=> This patch solve issue only in timer armv7
   get_boot_us() can be called everytime without div by 0 issue
   (gd->arch.timer_rate_hz is not used)

END

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
7 years agoRevert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
Tom Rini [Fri, 9 Dec 2016 12:56:54 +0000 (07:56 -0500)] 
Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"

This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing
changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.

7 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Fri, 9 Dec 2016 12:10:39 +0000 (07:10 -0500)] 
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

7 years agonet/phy/vitesse: Rework RGMII skew configuration for VSC8601
Alex [Tue, 22 Nov 2016 18:55:13 +0000 (10:55 -0800)] 
net/phy/vitesse: Rework RGMII skew configuration for VSC8601

The VSC8601 config tried to add an RGMII skew based on #defines that
no config defines. That's quite an ugly way to do it. Since the skew
is only needed on RGMII interfaces, check the interface mode at
runtime, and apply the settings accordingly.

Tested on custom board with AM3352 SOC and VSC801 PHY.

Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agonet: usb: r8152: Use ALLOC_CACHE_ALIGN_BUFFER() to allocate the buffers
Stefan Roese [Tue, 22 Nov 2016 15:14:23 +0000 (16:14 +0100)] 
net: usb: r8152: Use ALLOC_CACHE_ALIGN_BUFFER() to allocate the buffers

Testing on theadorable (Armada XP) has shown, that using this driver
results in many cache misaligned warning, such as:

CACHE: Misaligned operation at range [7fabd8fc7fabd900]

This patch now uses the ALLOC_CACHE_ALIGN_BUFFER() macro to allocate the
buffers on a cache aligned boundary. This fixes all warnings seen on the
Armada XP platform.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Ted Chen <tedchen@realtek.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agonet: fman: fix 2.5G SGMII settings
shaohui xie [Tue, 15 Nov 2016 06:36:47 +0000 (14:36 +0800)] 
net: fman: fix 2.5G SGMII settings

The settings for 2.5G SGMII are wrong, which the 2.5G case is missed in
set_if_mode(), and the serdes PCS configuration are wrong, this patch uses
the correct settings took from Linux.

Signed-off-by: Shaohui Xie <Shaohui.Xie@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
7 years agonet: phy: realtek: Only force master mode on rtl8211b/c
oliver@schinagl.nl [Tue, 8 Nov 2016 16:38:59 +0000 (17:38 +0100)] 
net: phy: realtek: Only force master mode on rtl8211b/c

Commit 525d187af ("net: phy: Optionally force master mode for RTL PHY")
added the define to force the PHY into master mode. Unfortunatly this is
an all or nothing switch. So it applies to either all PHY's or no PHY's.

The bug that define tried to solve was a buggy PLL in the RTL8211C only.

The Olimex OLinuXino Lime2 has gotten an upgrade where the PHY was
replaced with an RTL8211E. With this define however, both lime2 boards
are either forced to master mode or not. We could of course have a
binary for each board, but the following patch fixes this by adding a
'quirk' to the flags to the rtl8211b and rtl8211c only. It is now
possible to force master mode, but only have it apply to the rtl8211b
and rtl8211c.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>