oweals/u-boot.git
9 years agoimx: mx6 remove duplicated enable_cspi_clock
Peng Fan [Wed, 1 Jul 2015 09:01:49 +0000 (17:01 +0800)]
imx: mx6 remove duplicated enable_cspi_clock

enable_spi_clock does the same thing with enable_cspi_clock, so
remove enable_cspi_clock.
Remove enable_cspi_clock prototype in header file
convert cm_fx6/spl.c to use enable_spi_clk

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
9 years agoimx6: standardise OCOTP and fuse config to mx6_common
Peter Robinson [Wed, 24 Jun 2015 16:09:46 +0000 (17:09 +0100)]
imx6: standardise OCOTP and fuse config to mx6_common

According to README.mxc_ocotp the OCOTP is a stanard i.MX6 SoC feature
so centralise the config in mx6_common.h so functionality is standard
across all boards

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
9 years agothermal:imx_thermal: enter busywait cooling loop when over max CPU temp
Tim Harvey [Tue, 9 Jun 2015 13:40:22 +0000 (06:40 -0700)]
thermal:imx_thermal: enter busywait cooling loop when over max CPU temp

Remove the check for temperature being within the min/max range and enter the
busywait cooling loop whenever the CPU temperature is over the critical temp.
This fixes the issue where if a board was booted at a temp greater than
the CPU temperature max, it would skip the loop and never indicate or try
to address the overtemp issue.

Cc: Ye Li <b37916@freescale.com>
Cc: Jason Liu <r64343@freescale.com>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot
Stefano Babic [Fri, 10 Jul 2015 07:21:44 +0000 (09:21 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot

9 years agonet: designware: Program MAC address to hardware after soft reset
Bin Meng [Mon, 15 Jun 2015 10:40:19 +0000 (18:40 +0800)]
net: designware: Program MAC address to hardware after soft reset

commit f566c99 "net: Update hardware MAC address if it changes in env"
removes writing MAC address to designware controller after soft reset.
This makes designware ethernet port fail to work. Actually the MAC
address should always be programmed after soft reset.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
9 years agosunxi: Adjust Ippo_q8h_v1_2_a33_1024x600 dts filename to match the upstream kernel
Hans de Goede [Wed, 8 Jul 2015 14:18:39 +0000 (16:18 +0200)]
sunxi: Adjust Ippo_q8h_v1_2_a33_1024x600 dts filename to match the upstream kernel

sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dts has been merged into the upstream
Linux kernel as sun8i-a33-ippo-q8h-v1.2.dts, adjust u-boot to follow.

Note we've never shipped a final u-boot version with the old name, so this
is safe todo.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agoARM: DRA72x: fix io delay calibration for ethernet
Mugunthan V N [Mon, 22 Jun 2015 09:13:10 +0000 (14:43 +0530)]
ARM: DRA72x: fix io delay calibration for ethernet

we currently use in-development IODelay values for DRA72x which are
proposed in the data sheet, however, DRA72x EVM uses DP83865 ethernet
Phy over RGMII. The PHY characteristics and routing choices made on
the EVM, make the current iodelay values fail ethernet communication.

Instead, we need to choose custom values for DRA72x-evm specifically
designed for the PHY and routing on the platform for ethernet to
function.

Cc: Nishanth Menon <nm@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 7 Jul 2015 12:42:35 +0000 (08:42 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

9 years agoboard: baltos - add maintainer information
Yegor Yefremov [Wed, 1 Jul 2015 20:17:34 +0000 (22:17 +0200)]
board: baltos - add maintainer information

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
9 years agoARM: disable HAVE_PRIVATE_LIBGCC for ARM64
Masahiro Yamada [Fri, 3 Jul 2015 07:13:09 +0000 (16:13 +0900)]
ARM: disable HAVE_PRIVATE_LIBGCC for ARM64

We have not supported the private library for ARM 64bit.
Prohibit ARM64 boards from enabling it until we make things ready.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoboard: am43xx: Add maintainer information
Lokesh Vutla [Thu, 2 Jul 2015 04:07:59 +0000 (09:37 +0530)]
board: am43xx: Add maintainer information

am43xx_evm_ethboot/usbhost_boot_defconfig entries are
missing in MAINTAINER file. Adding entries for them.

Reported-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
9 years agocairo: add missing MAINTAINERS file
Albert ARIBAUD \(3ADEV\) [Wed, 1 Jul 2015 13:28:39 +0000 (15:28 +0200)]
cairo: add missing MAINTAINERS file

This removes the following two warnings from buildman:

WARNING: no status info for 'cairo'
WARNING: no maintainers for 'cairo'

Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
9 years agoarm: dcc: Add uart dcc support for armv8
Siva Durga Prasad Paladugu [Fri, 29 May 2015 07:54:37 +0000 (09:54 +0200)]
arm: dcc: Add uart dcc support for armv8

Added UART DCC support for armv8

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
9 years agoRevert "break build if it would produce broken binary"
Simon Glass [Tue, 2 Jun 2015 17:08:21 +0000 (11:08 -0600)]
Revert "break build if it would produce broken binary"

The root cause of this problem should now be fixed.

This reverts commit a6a4c542d316b3401f0840ac5378743191bca851.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Pavel Machek <pavel@denx.de>
Tested-by: Pavel Machek <pavel@denx.de>
9 years agoarm: Add ENTRY/ENDPROC to private libgcc functions
Simon Glass [Tue, 2 Jun 2015 17:08:20 +0000 (11:08 -0600)]
arm: Add ENTRY/ENDPROC to private libgcc functions

When CONFIG_SYS_THUMB_BUILD is defined these functions may be called from
Thumb code. Add the required ENTRY and ENDPROC bracketing so that BLX is
used to call these ARM functions, instead of plain BL, which will fail.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Pavel Machek <pavel@denx.de>
9 years agoMerge branch 'u-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 7 Jul 2015 09:38:44 +0000 (11:38 +0200)]
Merge branch 'u-boot/master' into 'u-boot-arm/master'

9 years agoarmv7: better comment in start.S
Pavel Machek [Wed, 8 Apr 2015 12:15:54 +0000 (14:15 +0200)]
armv7: better comment in start.S

Fix big/small letters in comment.

Signed-off-by: Pavel Machek <pavel@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
9 years agogpio: lpc32xx: Use priv_data instead of platdata
Axel Lin [Tue, 14 Apr 2015 06:55:24 +0000 (14:55 +0800)]
gpio: lpc32xx: Use priv_data instead of platdata

The LPC32XX GPIO driver platdata currently contains GPIO state information,
which should go into priv_data. Thus rename lpc32xx_gpio_platdata to
lpc32xx_gpio_priv and convert to use dev_get_priv() instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Albert ARIBAUD <albert.aribaud@3adev.fr>
9 years agomx53loco: Use generic 'load' command instead of 'fatload'
Guillaume GARDET [Tue, 16 Jun 2015 09:48:48 +0000 (11:48 +0200)]
mx53loco: Use generic 'load' command instead of 'fatload'

This patch uses generic 'load' command instead of 'fatload' for 'loadbootscript', 'loadimage' and 'loadfdt' for mx53loco board.

This allows to use EXT partition instead of FAT, while keeping FAT compatibility.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Jason Liu <r64343@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Jason Liu <r64343@freescale.com>
9 years agoMerge branch 'master' of http://git.denx.de/u-boot-sunxi
Tom Rini [Mon, 6 Jul 2015 01:22:22 +0000 (21:22 -0400)]
Merge branch 'master' of git.denx.de/u-boot-sunxi

9 years agosunxi: Add Sinlinx SinA33 defconfig
Chen-Yu Tsai [Tue, 23 Jun 2015 11:57:27 +0000 (19:57 +0800)]
sunxi: Add Sinlinx SinA33 defconfig

Sinlinx SinA33 is a core/daughter board SDK kit from Sinlinx. It has
the A33 SoC, USB host, USB OTG, audio input/output, LCD, camera, SDIO
and GPIO headers.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: Sync sun8i dts files with the linux kernel
Chen-Yu Tsai [Tue, 23 Jun 2015 11:57:26 +0000 (19:57 +0800)]
sunxi: Sync sun8i dts files with the linux kernel

Copy over all the latest dts changes from mripard/sunxi/dt-for-4.2.
This adds a dts file for Sinlinx SinA33 dev board, and the required
changes in the .dtsi files.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: Add support for UART0 in PB pin group on A33
Chen-Yu Tsai [Tue, 23 Jun 2015 11:57:25 +0000 (19:57 +0800)]
sunxi: Add support for UART0 in PB pin group on A33

The A33 adds a pinmux function for UART0 in the PB pin group.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: rsb: Enable R_PIO clock before configuring external pins
Chen-Yu Tsai [Tue, 23 Jun 2015 11:57:24 +0000 (19:57 +0800)]
sunxi: rsb: Enable R_PIO clock before configuring external pins

The original code was configuring the external pins after enabling
the R_PIO clock, which meant the configuration never made it to
the pin controller the first time in SPL.

Why this was working before is uncertain. Maybe the state was left
from a previous boot sequence, or RSB just happened to be the default
configuration. However with some A33 chips, SPL failed to configure
the PMIC. This was seen by me and Maxime on the Sinlinx SinA33 dev
board.

Reordering the calls fixed this.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agosunxi: hardware-feature-specific function index defines for PORT F UART0
Chen-Yu Tsai [Tue, 23 Jun 2015 11:57:23 +0000 (19:57 +0800)]
sunxi: hardware-feature-specific function index defines for PORT F UART0

Commit 487b327 ("sunxi: GPIO pin mux hardware-feature-specific function
index defines") renamed all GPIO index defines, but missed the PORT F
UART0 setup functions.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
9 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Fri, 3 Jul 2015 12:36:29 +0000 (08:36 -0400)]
Merge branch 'master' of git://denx.de/git/u-boot-imx

Conflicts:
configs/tbs2910_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
include/configs/mx6_common.h

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agocolibri_vf: Increase console IO buffer size to 1024
Sanchayan Maity [Mon, 8 Jun 2015 07:10:41 +0000 (12:40 +0530)]
colibri_vf: Increase console IO buffer size to 1024

Increase console IO buffer size to 1024 from the previous value of 256.
The previous value was too short for editing environment variables like
ubiboot from the console.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
9 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Wed, 1 Jul 2015 19:38:12 +0000 (15:38 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-spi

9 years agoMerge branch 'master' of git://git.denx.de/u-boot-uniphier
Tom Rini [Wed, 1 Jul 2015 19:37:56 +0000 (15:37 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-uniphier

9 years agospi: cf_qspi: fix clamp macro type check compilation warnings
Angelo Dureghello [Sun, 21 Jun 2015 21:40:46 +0000 (23:40 +0200)]
spi: cf_qspi: fix clamp macro type check compilation warnings

Fix compilation warnings for redefined 'clamp' macro and non-uniform
clamp macro types.

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agoREADME: Remove CONFIG_SPI_FLASH_DATAFLASH help text
Jagan Teki [Mon, 29 Jun 2015 18:18:31 +0000 (23:48 +0530)]
README: Remove CONFIG_SPI_FLASH_DATAFLASH help text

Since the help text is added in drivers/mtd/spi/Kconfig

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agoREADME: Remove CONFIG_SPI_FLASH_BAR help text
Jagan Teki [Mon, 29 Jun 2015 18:17:40 +0000 (23:47 +0530)]
README: Remove CONFIG_SPI_FLASH_BAR help text

Since the help text is added in drivers/mtd/spi/Kconfig

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agosf: Kconfig: Add SPI_FLASH_BAR entry
Jagan Teki [Mon, 29 Jun 2015 18:02:17 +0000 (23:32 +0530)]
sf: Kconfig: Add SPI_FLASH_BAR entry

Added SPI_FLASH_BAR entry on Kconfig with help description

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agodefconfig: Move CONFIG_SPI_FLASH_BAR from configs
Jagan Teki [Mon, 29 Jun 2015 17:06:18 +0000 (22:36 +0530)]
defconfig: Move CONFIG_SPI_FLASH_BAR from configs

This commit moves:
- CONFIG_SPI_FLASH_BAR

from include/configs/*.h into configs/*_defconfigs

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agoREADME: Remove CONFIG_SPI_FLASH_MTD help text
Jagan Teki [Mon, 29 Jun 2015 18:16:00 +0000 (23:46 +0530)]
README: Remove CONFIG_SPI_FLASH_MTD help text

Since the help text is added in drivers/mtd/spi/Kconfig

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agospi: Kconfig: Add TEGRA20_SLINK entry
Jagan Teki [Sat, 27 Jun 2015 10:37:54 +0000 (16:07 +0530)]
spi: Kconfig: Add TEGRA20_SLINK entry

Added TEGRA20_SLINK entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
9 years agospi: Kconfig: Add TEGRA20_SFLASH entry
Jagan Teki [Sat, 27 Jun 2015 10:34:05 +0000 (16:04 +0530)]
spi: Kconfig: Add TEGRA20_SFLASH entry

Added TEGRA20_SFLASH entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
9 years agospi: Kconfig: Add TEGRA114_SPI entry
Jagan Teki [Sat, 27 Jun 2015 10:27:53 +0000 (15:57 +0530)]
spi: Kconfig: Add TEGRA114_SPI entry

Added TEGRA114_SPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
9 years agospi: Kconfig: Add ICH_SPI entry
Jagan Teki [Sat, 27 Jun 2015 10:13:27 +0000 (15:43 +0530)]
spi: Kconfig: Add ICH_SPI entry

Added ICH_SPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
9 years agospi: Kconfig: Add EXYNOS_SPI entry
Jagan Teki [Sat, 27 Jun 2015 10:02:19 +0000 (15:32 +0530)]
spi: Kconfig: Add EXYNOS_SPI entry

Added EXYNOS_SPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
9 years agospi: Kconfig: Add FSL_QSPI entry
Jagan Teki [Sat, 27 Jun 2015 09:53:07 +0000 (15:23 +0530)]
spi: Kconfig: Add FSL_QSPI entry

Added FSL_QSPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Peng Fan <Peng.Fan@freescale.com>
Cc: Haikun Wang <haikun.wang@freescale.com>
9 years agospi: Kconfig: Add FSL_ESPI entry
Jagan Teki [Sat, 27 Jun 2015 09:51:36 +0000 (15:21 +0530)]
spi: Kconfig: Add FSL_ESPI entry

Added FSL_ESPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Haikun Wang <haikun.wang@freescale.com>
9 years agospi: Kconfig: Add FSL_DSPI entry
Jagan Teki [Sat, 27 Jun 2015 08:47:06 +0000 (14:17 +0530)]
spi: Kconfig: Add FSL_DSPI entry

Added FSL_DSPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Haikun Wang <haikun.wang@freescale.com>
9 years agospi: Kconfig: Show dm-spi drivers if DM_SPI set
Jagan Teki [Sat, 27 Jun 2015 17:07:00 +0000 (22:37 +0530)]
spi: Kconfig: Show dm-spi drivers if DM_SPI set

DM supported spi drivers are enbled only when DM_SPI enabled,
so added DM_SPI if condition in Kconfig to show thoese only
when it enabled.

Also re-order the config items as incresing alphabetic order.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agospi: Makefile: Use object file alphabetic order
Jagan Teki [Sat, 27 Jun 2015 08:21:53 +0000 (13:51 +0530)]
spi: Makefile: Use object file alphabetic order

Use object files as incresing alphabetic order, so-that it's
easy for readability.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agospi: Kconfig: Add TI_QSPI entry
Jagan Teki [Fri, 26 Jun 2015 23:11:11 +0000 (04:41 +0530)]
spi: Kconfig: Add TI_QSPI entry

Added TI_QSPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
9 years agospi: Kconfig: Add XILINX_SPI entry
Jagan Teki [Fri, 26 Jun 2015 23:02:43 +0000 (04:32 +0530)]
spi: Kconfig: Add XILINX_SPI entry

Added XILINX_SPI entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Michal Simek <michal.simek@xilinx.com>
9 years agospi: Add Kconfig menu entry
Jagan Teki [Sat, 27 Jun 2015 17:05:14 +0000 (22:35 +0530)]
spi: Add Kconfig menu entry

Added Kconfig menu ... endmenu enties for spi support.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agoARM: UniPhier: add IDs for PH1-Pro5, ProXstream2, PH1-LD6b
Masahiro Yamada [Tue, 30 Jun 2015 09:43:45 +0000 (18:43 +0900)]
ARM: UniPhier: add IDs for PH1-Pro5, ProXstream2, PH1-LD6b

This prepares for new SoCs support.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: dts: UniPhier: re-license device tree files under GPLv2+/X11
Masahiro Yamada [Tue, 30 Jun 2015 09:27:01 +0000 (18:27 +0900)]
ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11

The current GPL only licensing on the device trees makes it very
impractical for other software components licensed under another
license.

To make it easier to reuse them, the device trees for UniPhier
SoCs and boards have already been dual-licensed in Linux.

Follow this trend in U-boot too.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: dts: UniPhier: sync device trees with the Linux kernel
Masahiro Yamada [Tue, 30 Jun 2015 09:27:00 +0000 (18:27 +0900)]
ARM: dts: UniPhier: sync device trees with the Linux kernel

This makes code diff much easier.

Device trees describe hardware attributes, which are independent
of software architecture.  It generally makes sense to synchronize
them beyond software projects.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agoARM: UniPhier: drop special CONFIG_AUTOBOOT_ settings
Masahiro Yamada [Tue, 30 Jun 2015 08:10:22 +0000 (17:10 +0900)]
ARM: UniPhier: drop special CONFIG_AUTOBOOT_ settings

There is no good reason to use a particular key to stop autobooting.
The default allows us to stop the autoboot with any key input.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agosf: Kconfig: Add SPI_FLASH_DATAFLASH entry
Jagan Teki [Wed, 1 Jul 2015 15:52:19 +0000 (21:22 +0530)]
sf: Kconfig: Add SPI_FLASH_DATAFLASH entry

Added SPI_FLASH_DATAFLASH entry on Kconfig with help description.

data flash driver comes with good decription, hence moved the
same on to kconfig help decription.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Haikun Wang <haikun.wang@freescale.com>
9 years agosf: Kconfig: Add SPI_FLASH_MTD entry
Jagan Teki [Sat, 27 Jun 2015 17:12:35 +0000 (22:42 +0530)]
sf: Kconfig: Add SPI_FLASH_MTD entry

Added SPI_FLASH_MTD entry on Kconfig with help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Heiko Schocher <hs@denx.de>
9 years agosf: Kconfig: Update SPI_FLASH entry
Jagan Teki [Sun, 28 Jun 2015 19:29:36 +0000 (00:59 +0530)]
sf: Kconfig: Update SPI_FLASH entry

Updated SPI_FLASH entry on Kconfig with depends on
and along with config help description.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agocommon: Add CMD_SF Kconfig entry
Jagan Teki [Fri, 26 Jun 2015 22:17:53 +0000 (03:47 +0530)]
common: Add CMD_SF Kconfig entry

Added Kconfig entry for CMD_SF.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agosf: Add Kconfig menu entry
Jagan Teki [Sat, 27 Jun 2015 17:09:36 +0000 (22:39 +0530)]
sf: Add Kconfig menu entry

Added Kconfig menu ... endmenu enties for spi flash suppor

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agoREADME: Add CONFIG_SPI_FLASH_DATAFLASH description
Jagan Teki [Fri, 26 Jun 2015 21:54:53 +0000 (03:24 +0530)]
README: Add CONFIG_SPI_FLASH_DATAFLASH description

This patch adds CONFIG_SPI_FLASH_DATAFLASH descrition on README
file for more readble for users.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agosf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH
Jagan Teki [Sat, 27 Jun 2015 16:34:55 +0000 (22:04 +0530)]
sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH

Rename CONFIG_SF_DATAFLASH into CONFIG_SPI_FLASH_DATAFLASH
as it follows the naming convention same as remaining configs.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agozynq: defconfig: Move CONFIG_OF_* to Kconfig
Jagan Teki [Mon, 29 Jun 2015 08:47:32 +0000 (14:17 +0530)]
zynq: defconfig: Move CONFIG_OF_* to Kconfig

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
9 years agodefconfig: Add CONFIG_OF_CONTROL in zynq_picozed
Jagan Teki [Mon, 29 Jun 2015 08:46:30 +0000 (14:16 +0530)]
defconfig: Add CONFIG_OF_CONTROL in zynq_picozed

Enable FDT support for zynq_picozed board.

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agospi: Kconfig: Add Zynq SPI controller entry
Jagan Teki [Fri, 26 Jun 2015 19:21:38 +0000 (00:51 +0530)]
spi: Kconfig: Add Zynq SPI controller entry

Add Zynq SPI controller Kconfig entry.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Marek Vasut <marex@denx.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
9 years agospi: xilinx_spi: Add asm/io.h include file
Jagan Teki [Fri, 26 Jun 2015 19:21:37 +0000 (00:51 +0530)]
spi: xilinx_spi: Add asm/io.h include file

This patch includes asm/io.h for readl and writel calls.

build errors:
drivers/spi/xilinx_spi.c: In function 'xilinx_spi_probe':
drivers/spi/xilinx_spi.c:119:2: warning: implicit declaration of function 'writel' [-Wimplicit-function-declaration]
drivers/spi/xilinx_spi.c: In function 'xilinx_spi_xfer':
drivers/spi/xilinx_spi.c:193:2: warning: implicit declaration of function 'readl' [-Wimplicit-function-declaration]

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Michal Simek <michal.simek@xilinx.com>
9 years agodm: spi: xilinx_spi: Convert to driver model
Jagan Teki [Mon, 29 Jun 2015 07:45:18 +0000 (13:15 +0530)]
dm: spi: xilinx_spi: Convert to driver model

This converts the xilinx spi driver to use the driver model.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
9 years agodts: zynq: Enable spi1 for zc770_xm010 board
Jagan Teki [Fri, 26 Jun 2015 19:21:35 +0000 (00:51 +0530)]
dts: zynq: Enable spi1 for zc770_xm010 board

This patch enables spi1 for zynq zc770_xm010 board dts

Signed-off-by: Jagan Teki <jteki@openedev.com>
Tested-by: Jagan Teki <jteki@openedev.com>
9 years agospi: zynq_spi: Add fdt support in driver
Jagan Teki [Fri, 26 Jun 2015 19:21:34 +0000 (00:51 +0530)]
spi: zynq_spi: Add fdt support in driver

Now zynq spi driver platform data is controlled by devicetree,
enable the status by saying "okay" on respective board dts to use
the devicetree generated platdata.

Ex:
&spi1 {
status = "okay";
};

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
9 years agodts: zynq: Add zynq spi controller nodes
Jagan Teki [Fri, 26 Jun 2015 19:21:33 +0000 (00:51 +0530)]
dts: zynq: Add zynq spi controller nodes

This patch adds zynq spi controller nodes in zynq-7000.dtsi.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
9 years agozynq: Kconfig: Enable dm spi and spi_flash
Jagan Teki [Fri, 26 Jun 2015 19:21:32 +0000 (00:51 +0530)]
zynq: Kconfig: Enable dm spi and spi_flash

Enabled CONFIG_DM_SPI and CONFIG_DM_SPI_FLASH for zynq soc.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
9 years agodm: spi: zynq_spi: Convert to driver model
Jagan Teki [Fri, 26 Jun 2015 19:21:31 +0000 (00:51 +0530)]
dm: spi: zynq_spi: Convert to driver model

This converts the zynq spi driver to use the driver model.

Minimal functional changes like using meaningful name on
structure members wrt mainlined dm spi drivers.
- input_hz -> frequency
- req_hz -> freq
- base -> regs

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Simon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: Jagan Teki <jteki@openedev.com>
9 years agospi/sf: Minor cleanups
Jagan Teki [Fri, 26 Jun 2015 19:21:30 +0000 (00:51 +0530)]
spi/sf: Minor cleanups

- Adjust tab spaces
- Add comments

Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agospi: davinci_spi: Driver cleanup
Jagan Teki [Fri, 26 Jun 2015 19:21:29 +0000 (00:51 +0530)]
spi: davinci_spi: Driver cleanup

Arrange driver code in more readable format[1] for easy accessing
and readable.
[1] http://patchwork.ozlabs.org/patch/265683/

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Rex Chang <rchang@ti.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
9 years agospi: davinci_spi: Move header code to driver
Jagan Teki [Fri, 26 Jun 2015 19:21:28 +0000 (00:51 +0530)]
spi: davinci_spi: Move header code to driver

Move the header code into driver for more readable and
easy to access it.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Rex Chang <rchang@ti.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
9 years agospi: xilinx_spi: Driver clean-up
Jagan Teki [Fri, 26 Jun 2015 19:21:27 +0000 (00:51 +0530)]
spi: xilinx_spi: Driver clean-up

- Zap unneeded macros
- Re-arrange the code
- Removed __attribute__((weak))
- Replace __func__ macro with func names to save macro transition.
- Re-arranged comment lines.
- Arrange driver code in more readable format[1]

[1]  http://patchwork.ozlabs.org/patch/265683/

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
9 years agospi: xilinx_spi: Move header code to driver
Jagan Teki [Fri, 26 Jun 2015 19:21:26 +0000 (00:51 +0530)]
spi: xilinx_spi: Move header code to driver

Move the header code into driver for more readable and
easy to access it.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
9 years agospi: Zap oc_tiny_spi driver
Jagan Teki [Fri, 26 Jun 2015 19:21:25 +0000 (00:51 +0530)]
spi: Zap oc_tiny_spi driver

Zap oc_tiny_spi driver since the boards used this driver
is no longer been active.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
9 years agospi: Zap ftssp010_spi driver
Jagan Teki [Fri, 26 Jun 2015 19:21:24 +0000 (00:51 +0530)]
spi: Zap ftssp010_spi driver

Zap ftssp010_spi driver since the boards used this driver
is no longer been active.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Kuo-Jung Su <dantesu@faraday-tech.com>
Cc: Axel Lin <axel.lin@ingics.com>
9 years agospi: Zap andes_spi driver
Jagan Teki [Fri, 26 Jun 2015 19:21:23 +0000 (00:51 +0530)]
spi: Zap andes_spi driver

Zap andes_spi driver since the boards used this driver
is no longer been active.

Signed-off-by: Jagan Teki <jteki@openedev.com>
Cc: Macpaul Lin <macpaul@andestech.com>
9 years agoboard: axs103 - add maintainer information
Alexey Brodkin [Wed, 1 Jul 2015 13:47:42 +0000 (16:47 +0300)]
board: axs103 - add maintainer information

Looks like I forgot to add myself as a maintainer for AXS103 defconfig.
Fixing this now.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Tom Rini <trini@konsulko.com>
9 years agoarc: significant cache rework
Alexey Brodkin [Mon, 18 May 2015 13:56:26 +0000 (16:56 +0300)]
arc: significant cache rework

[1] Align cache management functions to those in Linux kernel. I.e.:
    a) Use the same functions for all cache ops (D$ Inv/Flush)
    b) Split cache ops in 3 sub-functions: "before", "lineloop" and
"after". That way we may re-use "before" and "after" functions for
region and full cache ops.

 [2] Implement full-functional L2 (SLC) management. Before SLC was
simply disabled early on boot. It's also possible to enable or disable
L2 cache from config utility.

 [3] Disable/enable corresponding caches early on boot. So if U-Boot is
configured to use caches they will be used at all times (this is useful
in partucular for speed-up of relocation).

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
9 years agoarc: implement slave cores kick-start for Linux kernel
Alexey Brodkin [Mon, 13 Apr 2015 10:37:05 +0000 (13:37 +0300)]
arc: implement slave cores kick-start for Linux kernel

With new SMP-enabled CPUs with ARC HS38 cores and corresponding support
in Linux kernel it's required to add basic SMP support in U-Boot.

Currently we assume the one and only core starts execution after
power-on. So most of things in U-Boot is handled in UP mode.

But when U-Boot is used for loading and starting Linux kernel right
before jumping to kernel's entry point U-Boot:
 [1] Sets all slave cores to jump to the same address [kernel's entry
point]
 [2] Really starts all slav cores

In ARC's implemetation of SMP in Linux kernel all cores are supposed to
run the same start-up code. But only core with ID 0 (master core)
processes further while others are looping waiting for master core to
complete some initialization.

That means it's safe to un-pause slave cores and let them execute kernel
- they will wait for master anyway.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
9 years agoPrepare v2015.07-rc3 v2015.07-rc3
Tom Rini [Mon, 29 Jun 2015 21:22:01 +0000 (17:22 -0400)]
Prepare v2015.07-rc3

Signed-off-by: Tom Rini <trini@konsulko.com>
9 years agosf: update sst25wf040b flash params
Haikun Wang [Mon, 29 Jun 2015 09:15:52 +0000 (17:15 +0800)]
sf: update sst25wf040b flash params

sst25wf040b doesn't support Auto Address Increment Programming command.
Remove SST_WR flag.

Signed-off-by: Haikun Wang <B53464@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agomtd, spi: Check if flash pointer is used
Heiko Schocher [Mon, 27 Apr 2015 05:42:07 +0000 (07:42 +0200)]
mtd, spi: Check if flash pointer is used

If flash pointer is used free it, before probing a new
flash and storing it in flash.

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Jagannadh Teki <jteki@openedev.com>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agospi, sf: Use offset and size in sf cmd from mtdpartition
Heiko Schocher [Mon, 27 Apr 2015 05:42:06 +0000 (07:42 +0200)]
spi, sf: Use offset and size in sf cmd from mtdpartition

With this patch, it is possible to get the offset and size information
from the mtdpartiton setting in "mtdparts", similiar to the
"nand" commandos.

=> sf
sf - SPI flash sub-system

Usage:
sf probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus
                                  and chip select
sf read addr offset|partition len       - read `len' bytes starting at
                                          `offset' to memory at `addr'
sf write addr offset|partition len      - write `len' bytes from memory
                                          at `addr' to flash at `offset'
sf erase offset|partition [+]len        - erase `len' bytes from `offset'
                                          `+len' round up `len' to block size
sf update addr offset|partition len     - erase and write `len' bytes from memory
                                          at `addr' to flash at `offset'
=>
for example "env" is defined in mtdparts:

=> sf read 13000000 env
device 0 offset 0xd0000, size 0x10000
SF: 65536 bytes @ 0xd0000 Read: OK

zynq-uboot> mtdparts add nor0 0x10000@0x0 env
zynq-uboot> sf erase env 0x10000
SF: 65536 bytes @ 0x0 Erased: OK

zynq-uboot> sf write 0x100 env
device 0 offset 0x0, size 0x10000
SF: 65536 bytes @ 0x0 Written: OK

zynq-uboot> sf read 0x40000 env
device 0 offset 0x0, size 0x10000
SF: 65536 bytes @ 0x0 Read: OK

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Jagannadh Teki <jteki@openedev.com>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agomtd, nand: Move common functions from cmd_nand.c to common place
Heiko Schocher [Mon, 27 Apr 2015 05:42:05 +0000 (07:42 +0200)]
mtd, nand: Move common functions from cmd_nand.c to common place

Move common functions from cmd_nand.c (for calculating offset
and size from cmdline paramter) to common place, so they could
used from other commands which use mtd partitions.

For onenand the arg_off_size() is left in common/cmd_onenand.c.
It should use now the common arg_off() function, but as I could
not test onenand I let it there ...

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agomtd, spi: Add MTD layer driver
Daniel Schwierzeck [Mon, 27 Apr 2015 05:42:04 +0000 (07:42 +0200)]
mtd, spi: Add MTD layer driver

Add MTD layer driver for spi, original patch from:
http://git.denx.de/?p=u-boot/u-boot-mips.git;a=commitdiff;h=bb246819cdc90493dd7089eaa51b9e639765cced

Changes from Heiko Schocher against this patch:
- Remove compile error if not defining CONFIG_SPI_FLASH_MTD:

  LD      drivers/mtd/spi/built-in.o
drivers/mtd/spi/sf_probe.o: In function `spi_flash_mtd_unregister':
/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
drivers/mtd/spi/sf_ops.o: In function `spi_flash_mtd_unregister':
/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
make[1]: *** [drivers/mtd/spi/built-in.o] Fehler 1
make: *** [drivers/mtd/spi] Fehler 2

- Add a README entry.
- Add correct writebufsize, to fit with Linux v3.14
  MTD, UBI/UBIFS sync.

Note (From Jagan): For testing raw mtd parition erase/read/write operations
using cmd_sf, sf_mtd should be required to register the spi flash device to
MTD layer but the sf_mtd_info ops were not required until and unless if we
use any flash filesystem layer say for example UBI. Due to this the foot-print
got increased ~290bytes in non-UBI case here that should be acceptible.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Jagannadh Teki <jteki@openedev.com>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
9 years agodefconfig: ls1021a: Add OF_CONTROL and DM support
Haikun Wang [Sat, 27 Jun 2015 16:21:05 +0000 (21:51 +0530)]
defconfig: ls1021a: Add OF_CONTROL and DM support

PI and QSPI only work when boot from QSPI on ls1021a.
This patch only enable options in qspi boot defconfig.

Signed-off-by: Haikun Wang <haikun.wang@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
9 years agoarm: ls102xa: Enable Driver Model SPI for ls1021atwr
Haikun Wang [Sat, 27 Jun 2015 16:16:13 +0000 (21:46 +0530)]
arm: ls102xa: Enable Driver Model SPI for ls1021atwr

Enable Driver Model SPI for ls1021atwr board.
DSPI and QSPI only be enabled when boot from QSPI.
DSPI and QSPI are compatible under Driver Model SPI.

Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
9 years agoarm: ls102xa: Enable Driver Model SPI for ls1021aqds
Haikun Wang [Mon, 29 Jun 2015 07:38:46 +0000 (13:08 +0530)]
arm: ls102xa: Enable Driver Model SPI for ls1021aqds

Enable Driver Model SPI for ls1021aqds board.
DSPI and QSPI is enabled only when boot from QSPI.
DSPI and QSPI are compatible under Driver Model SPI.

Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
9 years agodm: ls1021aqds: dts: Use "spi_dataflash" driver instead of "spi_flash_std" for DSPI...
Haikun Wang [Fri, 26 Jun 2015 11:30:41 +0000 (19:30 +0800)]
dm: ls1021aqds: dts: Use "spi_dataflash" driver instead of "spi_flash_std" for DSPI flash

The type of DSPI flash on ls1021aqds is AT45DB021, it has specail
commands and page-size.
Use the special spi flash driver instead of "spi_flash_std" driver.

Signed-off-by: Haikun Wang <haikun.wang@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagan Teki <jteki@openedev.com>
9 years agodm: sf: Add Atmel DataFlash spi flash driver
Haikun Wang [Fri, 26 Jun 2015 11:30:27 +0000 (19:30 +0800)]
dm: sf: Add Atmel DataFlash spi flash driver

Atmel DataFlash chips have commands different from common spi
flash commands.
Atmel DataFlash also have special page-size.
This driver add support for accessing Atmel DataFlash.
It is based on the Driver Model.
Example:
=> sf probe 1:0
SPI DataFlash: Detected AT45DB021B with page size 264 Bytes, erase size 264 Bytes, total 264 KiB, revision d
=> sf erase 0 42000
SF: 270336 bytes @ 0x0 Erased: OK
=> mw.l 82000000 45444342 20000
=> sf write 82000000 0 42000
SF: 270336 bytes @ 0x0 Written: OK
=> sf read 83000000 0 42000
SF: 270336 bytes @ 0x0 Read: OK
=> cmp.b 82000000 83000000 42000
Total of 270336 byte(s) were the same

Signed-off-by: Haikun Wang <haikun.wang@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Chakra Divi <cdivi@openedev.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
9 years agoMerge git://git.denx.de/u-boot-marvell
Tom Rini [Sun, 28 Jun 2015 20:31:32 +0000 (16:31 -0400)]
Merge git://git.denx.de/u-boot-marvell

9 years agodb-88f6820-gp.h: Load data blobs into lower memory
Kevin Smith [Mon, 18 May 2015 16:09:46 +0000 (16:09 +0000)]
db-88f6820-gp.h: Load data blobs into lower memory

By default on this platform, u-boot loads data into high memory
in the range of 0x7Fxxxxxx, which generates a data abort when the
kernel tries to read it.  Config the u-boot environment to load
the device tree and initrd image into lower memory to make them
accessible to the kernel.

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
9 years agomv-common.h: Include support for device trees
Kevin Smith [Mon, 18 May 2015 16:09:45 +0000 (16:09 +0000)]
mv-common.h: Include support for device trees

Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: Stefan Roese <sr@denx.de>
9 years agoRevert "sunxi/nand: Add support to the SPL for loading u-boot from internal NAND...
Ian Campbell [Fri, 26 Jun 2015 18:42:24 +0000 (19:42 +0100)]
Revert "sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memory"

This reverts commit f76eba38b3eda905ff3bdc18dd1240d3dcbc6e5a.

This patch did not have a full and proper copyright/S-o-b chain.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Conflicts:
include/configs/sun6i.h
include/configs/sun8i.h

9 years agomx6cuboxi: drop options that are duplicated in mx6_common
Peter Robinson [Tue, 16 Jun 2015 09:20:02 +0000 (10:20 +0100)]
mx6cuboxi: drop options that are duplicated in mx6_common

These options were merged into mx6_common and were seemingly missed
in mx6cuboxi so drop the duplicates

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
9 years agoDrop duplicate CONFIG_SYS_NO_FLASH from mx6_common
Peter Robinson [Tue, 16 Jun 2015 09:20:01 +0000 (10:20 +0100)]
Drop duplicate CONFIG_SYS_NO_FLASH from mx6_common

It's defind earlier in the file

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
9 years agoimx: mx6 introuduce macro is_mx6dqp
Peng Fan [Thu, 11 Jun 2015 10:30:37 +0000 (18:30 +0800)]
imx: mx6 introuduce macro is_mx6dqp

Add a new revision CHIP_REV_2_0.
Introudce macro is_mx6dqp, dqp means Dual/Quad Plus.
Since Dual/Quad Plus use same cpu type with Dual/Quad, but different
revision(Major Lower), we use this macro for Dual/Quad Plus.

Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx: mx6 correct get_cpu_rev
Peng Fan [Thu, 11 Jun 2015 10:30:36 +0000 (18:30 +0800)]
imx: mx6 correct get_cpu_rev

The DIGPROG register map:
23 ------- 16 | 15 ------ 8 | 7 --- 0 |
 Major upper  | Major Lower |  Minor  |

We also need to account for Major Lower.

Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
9 years agoimx: mx6 correct is_soc_rev usage
Peng Fan [Thu, 11 Jun 2015 10:30:35 +0000 (18:30 +0800)]
imx: mx6 correct is_soc_rev usage

is_soc_rev should return a bool value, so use "==", but not "-",
change (is_soc_rev(CHIP_REV_1_0) > 0) to (soc_rev() > CHIP_REV_1_0).
This patch also add space between "&" for cpu_type(rev) macro.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>