]> git.ipfire.org Git - people/ms/u-boot.git/log
people/ms/u-boot.git
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 years agoMerge git://git.denx.de/u-boot-mpc85xx
Tom Rini [Thu, 7 Jan 2016 16:24:27 +0000 (11:24 -0500)] 
Merge git://git.denx.de/u-boot-mpc85xx

8 years agospi: fsl_qspi: fix an error of using GENMASK
Gong Qianyu [Mon, 14 Dec 2015 10:26:25 +0000 (18:26 +0800)] 
spi: fsl_qspi: fix an error of using GENMASK

This commit fixes the change of below commit
"spi: fsl_qspi: Use GENMASK"
(sha1 :bad490a24212c068c5b718b9189f47ea4075d078)

Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
8 years agospi: spi_flash: Fix the arguments of stm_is_locked_sr()
Fabio Estevam [Wed, 6 Jan 2016 00:24:39 +0000 (22:24 -0200)] 
spi: spi_flash: Fix the arguments of stm_is_locked_sr()

stm_is_locked_sr() takes the status register (SR) value as the last
parameter, not the second.

Based on a patch from Brian Norris for the linux kernel:
http://git.infradead.org/linux-mtd.git/commit/a32d5b726ff8cf32bf491522b0ac8ae2545a063e

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
8 years agopowerpc, mpc5xxx: fix missing bootflag init
Heiko Schocher [Wed, 25 Nov 2015 08:46:19 +0000 (09:46 +0100)] 
powerpc, mpc5xxx: fix missing bootflag init

since:
commit: f05ad9ba "Add a way to skip relocation"

tqm5200s board fails to boot. Reason is that
board_init_f has a function parameter bootflag,
which is not setup in
in arch/powerpc/cpu/mpc5xxx/start.S _start

So board_init_f gets a undefined bootflag,
currently the gd pointer address. Unfortunately
this address sets the GD_FLG_SKIP_RELOC bit,
so u-boot code gets not relocated and u-boot
does not boot ...

Init bootflag with 0, and tqm5200 boots fine again.

Signed-off-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <yorksun@freescale.com>
8 years agoPrepare v2016.01-rc4
Tom Rini [Mon, 4 Jan 2016 21:37:15 +0000 (16:37 -0500)] 
Prepare v2016.01-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agocommon: nvedit: use snprintf instead of sprintf
Peng Fan [Wed, 23 Dec 2015 04:08:09 +0000 (12:08 +0800)] 
common: nvedit: use snprintf instead of sprintf

Use snprintf to replace sprintf.

Coverity log:
"
Unbounded source buffer (STRING_SIZE)
string_size: Passing string init_val of unknown size to sprintf.
"

Reported-by: Coverity
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
8 years agocommon: env: initialize scalar variable
Peng Fan [Wed, 23 Dec 2015 04:07:24 +0000 (12:07 +0800)] 
common: env: initialize scalar variable

Before calling hsearch_r, initialize callback entry to NULL.

Coverity log:
"
Uninitialized scalar variable (UNINIT)
uninit_use_in_call: Using uninitialized value e.
Field e.callback is uninitialized when calling hsearch_r.
"

Reported-by: Coverity
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
8 years agocommon: cli: avoid memory leak
Peng Fan [Tue, 22 Dec 2015 09:14:13 +0000 (17:14 +0800)] 
common: cli: avoid memory leak

Whether CONFIG_SYS_HUSH_PARSER is defined or not, should always
check to free 'buff' to avoid memory leak.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Simon Glass <sjg@chromium.org>
8 years agonet: e1000: use correct helper to do endianness conversion
Miao Yan [Mon, 21 Dec 2015 10:07:02 +0000 (02:07 -0800)] 
net: e1000: use correct helper to do endianness conversion

In struct e1000_rx_desc, field 'length' is declared as
uint16_t, so use le16_to_cpu() to do endianness conversion.

Also drop conversion on 'status' which is declared as
uint8_t.

Signed-off-by: Miao Yan <yanmiaobest@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
8 years agoqemu-ppce500: pass 'range_id' around in pci_map_region
Miao Yan [Mon, 21 Dec 2015 09:19:59 +0000 (01:19 -0800)] 
qemu-ppce500: pass 'range_id' around in pci_map_region

In pci_map_region(), pass 'range_id' to fdt_read_range(),
otherwise the same address will be mapped again in other
calls to pci_map_region()

Signed-off-by: Miao Yan <yammiaobest@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
8 years agocheckpatch: fix left brace warning
Heiko Schocher [Mon, 4 Jan 2016 08:17:19 +0000 (09:17 +0100)] 
checkpatch: fix left brace warning

using checkpatch with Perl 5.22.0 generates a warning,
this is fixed in linux through commit:

commit 4e5d56bdf892e18832a6540b63ebf709966bce2a
Author: Eddie Kovsky <ewk@edkovsky.org>
Date:   Wed Sep 9 15:37:52 2015 -0700

checkpatch: fix left brace warning

Using checkpatch.pl with Perl 5.22.0 generates the following warning:

Unescaped left brace in regex is deprecated, passed through in regex;

This patch fixes the warnings by escaping occurrences of the left brace
inside the regular expression.

Adapt it for U-Boot.

Signed-off-by: Heiko Schocher <hs@denx.de>
8 years agommc: update MMC_ERASE argument to match Linux kernel.
Eric Nelson [Mon, 7 Dec 2015 14:50:01 +0000 (07:50 -0700)] 
mmc: update MMC_ERASE argument to match Linux kernel.

Table 41 of the JEDEC standard for eMMC says that bit 31 of
the command argument is obsolete when issuing the ERASE
command (CMD38) on page 115 of this document:
http://www.jedec.org/sites/default/files/docs/jesd84-B45.pdf

The SD Card Association Physical Layer Simplified Specification also
makes no mention of the use of bit 31.
https://www.sdcard.org/downloads/pls/part1_410.pdf

The Linux kernel distinguishes between secure (bit 31 set) and
non-secure erase, and this patch copies the macro names from
include/linux/mmc/core.h.

Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Eric Nelson <eric@nelint.com>
Tested-by: Hector Palacios <hector.palacios@digi.com>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Tom Rini [Mon, 4 Jan 2016 15:53:50 +0000 (10:53 -0500)] 
Merge branch 'master' of git://git.denx.de/u-boot-ubi

8 years agoUBI: Fix compile error when CONFIG_UBI_SILENCE_MSG defined
Ladislav Michl [Sun, 3 Jan 2016 21:05:03 +0000 (22:05 +0100)] 
UBI: Fix compile error when CONFIG_UBI_SILENCE_MSG defined

drivers/mtd/ubi/io.c:1354:3: error: 'dump_len' undeclared (first use in
this function)
   dump_len = max_t(int, 128, len - i);

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
8 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Sun, 3 Jan 2016 15:32:24 +0000 (10:32 -0500)] 
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

8 years agoimx: mx6qsabreauto: support lvds display
Peng Fan [Tue, 15 Dec 2015 08:27:18 +0000 (16:27 +0800)] 
imx: mx6qsabreauto: support lvds display

Move setup_display from board_early_init_f to board_init.
Add more clock settings.
Add blacklight iomux setting.
Add display_info_t info for the lvds screen.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
8 years agoi2c: mxc: add a condition in case the parameter is NULL
Gong Qianyu [Fri, 18 Dec 2015 09:38:01 +0000 (17:38 +0800)] 
i2c: mxc: add a condition in case the parameter is NULL

This could avoid executing the code that only applies to i.MX platforms.

The bus_i2c_init() is called before relocation and will assgin value
to a static variable. If U-Boot is then still running in a flash
device, it's theoretically not allowed to write data to flash without
an erasing operation. For i.MX platforms, the U-Boot is always running
in DDR.

Actually it causes asynchronous error when the ARM64 system error
report is enabled and the flash write protect is set.

Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
8 years agoimx_common: check for Serial Downloader in spl_boot_device
Stefano Babic [Fri, 11 Dec 2015 16:30:42 +0000 (17:30 +0100)] 
imx_common: check for Serial Downloader in spl_boot_device

Check for bmode before reading the boot device
to check if a serial downloader is started,
and returns UART if the serial downloader is set,
letting SPL to wait for an image if
CONFIG_SPL_YMODEM_SUPPORT is set.

This allows to load again a SPL based board
with imx_usb_loader together with a tool
such as kermit.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tim Harvey <tharvey@gateworks.com>
CC: Fabio Estevam <Fabio.Estevam@freescale.com>
CC: Eric Nelson <eric.nelson@boundarydevices.com>
Reviewed-by: Eric Nelson <eric@nelint.com>
Tested-by: Eric Nelson <eric@nelint.com>
8 years agoARM: mxs: allow boards to select DC-DC switching clock source
Michael Heimpold [Sun, 13 Dec 2015 11:08:37 +0000 (12:08 +0100)] 
ARM: mxs: allow boards to select DC-DC switching clock source

For some board designs, it might be useful to switch the DC-DC
clock source to something else rather the default 24 MHz, e.g.
for EMI reasons.

For this, override the mxs_power_setup_dcdc_clocksource function
in your board support files.

Example:
void mxs_power_setup_dcdc_clocksource(void)
{
    mxs_power_switch_dcdc_clocksource(POWER_MISC_FREQSEL_20MHZ);
}

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
8 years agocgtqmx6eval: fix pad configuration for SPI bus
Michael Schanz [Thu, 10 Dec 2015 08:58:35 +0000 (09:58 +0100)] 
cgtqmx6eval: fix pad configuration for SPI bus

Use the macro SETUP_IOMUX_PAD(...) rather than imx_iomux_v3_setup_multiple_pads(...) in order to setup
the pin configuration for ECSPI1.

ARRAY_SIZE(pads) provides the wrong size for imx_iomux_v3_setup_multiple_pads(pads, ARRAY_SIZE(pads)) in
case of MX6QDL. In the particular case, the content of GPR12 is overwritten and the IPG/AHB/ATB/ATP clocks
are deactivated. Therefore, the connection to the system via JTAG is not possible anymore. Furthermore,
kernel version 3.0.35 hangs during bootprocess in the function etm_init().

Signed-off-by: Michael Schanz <michael.schanz@congatec.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
8 years agonet: fec_mxc: unregister mdio bus on probe error
Måns Rullgård [Tue, 8 Dec 2015 15:38:46 +0000 (15:38 +0000)] 
net: fec_mxc: unregister mdio bus on probe error

If fecmxc_initialize_multi() fails, it frees but does not unregister
the mdio bus, causing subsequent uses of the "mii" command to crash.
Fix this by adding mdio_unregister() calls where needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Reviewed-by: Eric Nelson <eric@nelint.com>
8 years agonet: fec_mxc: configure MDIO hold time
Måns Rullgård [Tue, 8 Dec 2015 15:38:45 +0000 (15:38 +0000)] 
net: fec_mxc: configure MDIO hold time

If the host clock frequency is higher than 100 MHz, the MDIO hold
time needs to be increased from its current setting of one cycle in
order to meet the specified minium of 10 ns.  Writing an appropriate
value to the HOLDTIME field of the MII_SPEED register achieves this.

Comment copied from Linux kernel.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Reviewed-by: Eric Nelson <eric@nelint.com>
8 years agoserial_mxc: Fix setup of UARTx_UFCR register
Maximilian Schwerin [Wed, 25 Nov 2015 13:08:00 +0000 (14:08 +0100)] 
serial_mxc: Fix setup of UARTx_UFCR register

This patch writes the default values for TXTL and RXTL to UARTx_UFCR.
Without this patch some older kernel versions crash as UARTx_UFCR was
not always correctly initialized.

Signed-off-by: Maximilian Schwerin <maximilian.schwerin@tigris.de>
8 years agoARM: imx: fsl_esdhc: fix usage of low 4 bits of sysctl register
Eric Nelson [Fri, 4 Dec 2015 19:32:48 +0000 (12:32 -0700)] 
ARM: imx: fsl_esdhc: fix usage of low 4 bits of sysctl register

The low four bits of the SYSCTL register are reserved on the USDHC
controller on i.MX6 and i.MX7 processors, but are used for clocking
operations on earlier models.

Guard against their usage by hiding the bit mask macros on those
processors.

These bits are used to prevent glitches when changing clocks on
i.MX35 et al. Use the RSTA bit instead for i.MX6 and i.MX7.

>From the i.MX6DQ RM:
To prevent possible glitch on the card clock, clear the
FRC_SDCLK_ON bit when changing clock divisor value(SDCLKFS
or DVS in System Control Register) or setting RSTA bit.

Signed-off-by: Eric Nelson <eric@nelint.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Hector Palacios <hector.palacios@digi.com>
8 years agoimx: ddr: drop duplicated debug info
Peng Fan [Thu, 15 Oct 2015 10:06:00 +0000 (18:06 +0800)] 
imx: ddr: drop duplicated debug info

Drop duplicated debug info for tcl.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
8 years agoMerge git://git.denx.de/u-boot-usb
Tom Rini [Sat, 2 Jan 2016 17:24:43 +0000 (12:24 -0500)] 
Merge git://git.denx.de/u-boot-usb

8 years agousb: musb: Fix hub port setting for SPLIT transactions
Stefan Brüns [Tue, 22 Dec 2015 00:21:04 +0000 (01:21 +0100)] 
usb: musb: Fix hub port setting for SPLIT transactions

The ifdef'ed Linux kernel code uses the 1 based port number, whereas U-Boot
puts a 0 based port number into the register. The reason the 0 based port
number apparently works can probably be taken from the USB 2.0 spec:

8.4.2.2 Start-Split Transaction Token
... The host must correctly set the port field for single and multiple TT
hub implementations. A single TT hub implementation *may ignore* the port
field.

Actually, as far as I understand, a multi TT hub defaults to single TT
(bAlternateSetting: 0) until switched via SetInterface, so even "port 42"
would work.

The change was verified by hardcoding the port number to a wrong value,
SPLIT transactions kept working (although using a DWC2 instead of MUSB).
Tested hubs are the RPi onboard SMC9514 and an external "05e3:0608
Genesys Logic, Inc. USB-2.0 4-Port HUB". The former is a multi TT hub,
the latter single TT only.

Addendum: Tested on sunxi/MUSB by Hans de Goede

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
8 years agousb: Move determination of TT hub address/port into separate function
Stefan Brüns [Tue, 22 Dec 2015 00:21:03 +0000 (01:21 +0100)] 
usb: Move determination of TT hub address/port into separate function

Start split and complete split tokens need the hub address and the
downstream port of the first HS hub (device view).

The core of the function was duplicated in both host/ehci_hcd and
musb-new/usb-compat.h.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
8 years agousb: dwc2: avoid out of bounds access
Stefan Brüns [Tue, 22 Dec 2015 00:21:48 +0000 (01:21 +0100)] 
usb: dwc2: avoid out of bounds access

flush_dcache_range may access data after priv->aligned_buffer end if
len > DWC2_DATA_BUF_SIZE.
memcpy may access data after buffer end if done > 0

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
8 years agousb: Alloc buffer for USB descriptor dynamically
Stefan Brüns [Tue, 22 Dec 2015 00:18:13 +0000 (01:18 +0100)] 
usb: Alloc buffer for USB descriptor dynamically

The configuration descriptor includes all interface, endpoint and
auxiliary descriptors (e.g. report, union) so 512 bytes may not be enough.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
8 years agoaltera_qspi: allow ctrl-c to abort the erase ops
Thomas Chou [Wed, 23 Dec 2015 13:47:02 +0000 (21:47 +0800)] 
altera_qspi: allow ctrl-c to abort the erase ops

Allow ctrl-c to abort the erase ops.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
8 years agoaltera_qspi: show erase progress
Thomas Chou [Wed, 23 Dec 2015 12:41:49 +0000 (20:41 +0800)] 
altera_qspi: show erase progress

Show sector erase progress with dot and comma.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
8 years agoaltera_qspi: skip erase if the sector is blank
Thomas Chou [Wed, 23 Dec 2015 02:33:52 +0000 (10:33 +0800)] 
altera_qspi: skip erase if the sector is blank

Skip erase if the sector is blank. The sector erase is slow, and
may take 0.7 sec typically or up to 3 sec worst-case.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
8 years agoaltera_qspi: set fail_addr for erase ops
Thomas Chou [Wed, 23 Dec 2015 13:06:12 +0000 (21:06 +0800)] 
altera_qspi: set fail_addr for erase ops

If the erase fails, fail_addr might indicate exactly which block
failed. If fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not
at the device level or was not specific to any particular block.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
8 years agoaltera_qspi: call callback even if the erase failed
Thomas Chou [Wed, 23 Dec 2015 02:26:03 +0000 (10:26 +0800)] 
altera_qspi: call callback even if the erase failed

Erase is an asynchronous operation.  Device drivers are supposed
to call instr->callback() whenever the operation completes, even
if it completes with a failure.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
8 years agoMerge branch 'master' of http://git.denx.de/u-boot-sunxi
Tom Rini [Sun, 27 Dec 2015 14:15:57 +0000 (09:15 -0500)] 
Merge branch 'master' of http://git.denx.de/u-boot-sunxi

8 years agosunxi: Reduce Orangepi PC RAM speed to 624 MHz
Hans de Goede [Wed, 23 Dec 2015 10:48:40 +0000 (11:48 +0100)] 
sunxi: Reduce Orangepi PC RAM speed to 624 MHz

There are some reports of stability issues at 672 MHz, see:
http://linux-sunxi.org/Orange_Pi_PC#DRAM_clock_speed_limit

So reduce the DRAM speed to 624MHz which seems to be reliable everywhere.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
8 years agoMerge git://git.denx.de/u-boot-socfpga
Tom Rini [Thu, 24 Dec 2015 14:31:35 +0000 (09:31 -0500)] 
Merge git://git.denx.de/u-boot-socfpga

Conflicts:
include/configs/axs101.h

Signed-off-by: Tom Rini <trini@konsulko.com>
8 years agoarm: socfpga: Fix i2c mux on cyclone5-socdk board
Chin Liang See [Wed, 23 Dec 2015 14:07:49 +0000 (22:07 +0800)] 
arm: socfpga: Fix i2c mux on cyclone5-socdk board

Updated pinmux group GENERALIO[15-16] for i2c.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: shengjiangwu <shengjiangwu@icloud.com>
8 years agoarm: socfpga: Fix USB doesn't work on socdk board
shengjiangwu [Wed, 23 Dec 2015 02:37:31 +0000 (10:37 +0800)] 
arm: socfpga: Fix USB doesn't work on socdk board

Updated pinmux group EMACIO[1-8] and EMACIO[10-13] for USB.

Signed-off-by: shengjiangwu <shengjiangwu@icloud.com>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: Add support for Denali NAND controller
Marek Vasut [Sun, 20 Dec 2015 03:00:46 +0000 (04:00 +0100)] 
arm: socfpga: Add support for Denali NAND controller

Add common configuration bits for the Denali NAND controller and also
support for using it as a boot device in SPL.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
8 years agoarm: socfpga: Enable DFU MMC support only if DM_MMC is enabled
Marek Vasut [Sun, 20 Dec 2015 03:00:45 +0000 (04:00 +0100)] 
arm: socfpga: Enable DFU MMC support only if DM_MMC is enabled

It is not possible to compile DFU MMC support if the MMC support is not
compiled into U-Boot. Secure the code with an ifdef to prevent compiler
splat.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
8 years agoarm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled
Marek Vasut [Sun, 20 Dec 2015 03:00:44 +0000 (04:00 +0100)] 
arm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled

It is not possible to compile MMC/SPI SPL if the respective DM_MMC/DM_SPI
bits are not enabled. Secure the code with an ifdef to prevent compiler
splat.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
8 years agoarm: socfpga: Unreset NAND in U-Boot
Marek Vasut [Sun, 20 Dec 2015 03:00:43 +0000 (04:00 +0100)] 
arm: socfpga: Unreset NAND in U-Boot

Make sure the NAND reset is not asserted in full U-Boot.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
8 years agoarm: socfpga: Unreset NAND in SPL
Marek Vasut [Sun, 20 Dec 2015 03:00:42 +0000 (04:00 +0100)] 
arm: socfpga: Unreset NAND in SPL

If the system boots from NAND, make sure to de-assert the NAND IP
reset, otherwise the system will get stuck.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
8 years agoarm: socfpga: Define NAND reset bit
Marek Vasut [Sun, 20 Dec 2015 03:00:41 +0000 (04:00 +0100)] 
arm: socfpga: Define NAND reset bit

Define the NAND reset bit and fix the ordering of the macros.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
8 years agoarm: socfpga: Fix QSPI doesn't work on socdk board
shengjiangwu [Tue, 22 Dec 2015 09:18:09 +0000 (17:18 +0800)] 
arm: socfpga: Fix QSPI doesn't work on socdk board

Updated pinmux group MIXED1IO[15-20] for QSPI.
Updated QSPI clock.

Signed-off-by: shengjiangwu <shengjiangwu@icloud.com>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: Fix emac1 doesn't work on socdk board
shengjiangwu [Tue, 22 Dec 2015 07:22:02 +0000 (15:22 +0800)] 
arm: socfpga: Fix emac1 doesn't work on socdk board

Updated pinmux group MIXED1IO[0-13] for RGMII1.
Updated EMAC1 clock.

Signed-off-by: shengjiangwu <shengjiangwu@icloud.com>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sr1500: Update qspiboot to use UBIFS
Chin Liang See [Tue, 22 Dec 2015 07:32:42 +0000 (15:32 +0800)] 
arm: socfpga: sr1500: Update qspiboot to use UBIFS

Update the qspiboot console command to use UBIFS instead
of old jffs2 file system.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sockit: Update qspiboot to use UBIFS
Chin Liang See [Tue, 22 Dec 2015 07:32:41 +0000 (15:32 +0800)] 
arm: socfpga: sockit: Update qspiboot to use UBIFS

Update the qspiboot console command to use UBIFS instead
of old jffs2 file system.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: arria5_socdk: Update qspiboot to use UBIFS
Chin Liang See [Tue, 22 Dec 2015 07:32:40 +0000 (15:32 +0800)] 
arm: socfpga: arria5_socdk: Update qspiboot to use UBIFS

Update the qspiboot console command to use UBIFS instead
of old jffs2 file system.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS
Chin Liang See [Tue, 22 Dec 2015 07:32:39 +0000 (15:32 +0800)] 
arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Update the qspiboot console command to use UBIFS instead
of old jffs2 file system.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sr1500: Enable qspiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:38 +0000 (15:32 +0800)] 
arm: socfpga: sr1500: Enable qspiload console command

Enabling qspiload command which will load the kernel
image and dtb from UBIFS within MTD partition labeled
UBI.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sockit: Enable qspiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:37 +0000 (15:32 +0800)] 
arm: socfpga: sockit: Enable qspiload console command

Enabling qspiload command which will load the kernel
image and dtb from UBIFS within MTD partition labeled
UBI.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: arria5_socdk: Enable qspiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:36 +0000 (15:32 +0800)] 
arm: socfpga: arria5_socdk: Enable qspiload console command

Enabling qspiload command which will load the kernel
image and dtb from UBIFS within MTD partition labeled
UBI.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: cyclone5_socdk: Enable qspiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:35 +0000 (15:32 +0800)] 
arm: socfpga: cyclone5_socdk: Enable qspiload console command

Enabling qspiload command which will load the kernel
image and dtb from UBIFS within MTD partition labeled
UBI.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sr1500: Enable ubiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:34 +0000 (15:32 +0800)] 
arm: socfpga: sr1500: Enable ubiload console command

Enabling ubiload command to load kernel image and
device tree from mtd part labeled "UBI". ubiload
command will search the file from directory /boot.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sockit: Enable ubiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:33 +0000 (15:32 +0800)] 
arm: socfpga: sockit: Enable ubiload console command

Enabling ubiload command to load kernel image and
device tree from mtd part labeled "UBI". ubiload
command will search the file from directory /boot.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: arria5_socdk: Enable ubiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:32 +0000 (15:32 +0800)] 
arm: socfpga: arria5_socdk: Enable ubiload console command

Enabling ubiload command to load kernel image and
device tree from mtd part labeled "UBI". ubiload
command will search the file from directory /boot.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: cyclone5_socdk: Enable ubiload console command
Chin Liang See [Tue, 22 Dec 2015 07:32:31 +0000 (15:32 +0800)] 
arm: socfpga: cyclone5_socdk: Enable ubiload console command

Enabling ubiload command to load kernel image and
device tree from mtd part labeled "UBI". ubiload
command will search the file from directory /boot.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: sr1500: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS
Chin Liang See [Tue, 22 Dec 2015 07:32:30 +0000 (15:32 +0800)] 
arm: socfpga: sr1500: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS

Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS for UBI
and UBIFS support on serial NOR flash

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: arria5: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS
Chin Liang See [Tue, 22 Dec 2015 07:32:28 +0000 (15:32 +0800)] 
arm: socfpga: arria5: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS

Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS for UBI
and UBIFS support on serial NOR flash

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: cyclone5: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS
Chin Liang See [Tue, 22 Dec 2015 07:32:27 +0000 (15:32 +0800)] 
arm: socfpga: cyclone5: Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS

Undefine CONFIG_SPI_FLASH_USE_4K_SECTORS for UBI
and UBIFS support on serial NOR flash

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoarm: socfpga: Enable ubi and ubifs support
Chin Liang See [Tue, 22 Dec 2015 07:32:26 +0000 (15:32 +0800)] 
arm: socfpga: Enable ubi and ubifs support

When QSPI and NAND is enabled, the ubi and ubifs support
will be enabled too.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
8 years agoARM: dts: uniphier: add SD/MMC pinmux nodes
Masahiro Yamada [Mon, 21 Dec 2015 02:14:22 +0000 (11:14 +0900)] 
ARM: dts: uniphier: add SD/MMC pinmux nodes

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: allow to run zImage rather than uImage
Masahiro Yamada [Fri, 18 Dec 2015 05:52:32 +0000 (14:52 +0900)] 
ARM: uniphier: allow to run zImage rather than uImage

UniPhier SoC family adopt ARM Multi-platform in Linux since the first
upstreaming.  Because CONFIG_ARM_PATCH_PHYS_VIRT is defined, the
kernel image is completely position-independent.  There is no reason
to decide the load address on compile time, but it is up to the boot
loader.  Now, zImage is handier than uImage, also it allows to skip
the relocation of the kernel image.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: rename rest of defconfig files
Masahiro Yamada [Thu, 17 Dec 2015 09:00:41 +0000 (18:00 +0900)] 
ARM: uniphier: rename rest of defconfig files

Rename rest of defconfig files of UniPhier SoC family to have the
prefix uniphier_.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: support ProXstream2, PH1-LD6b boards in single defconfig
Masahiro Yamada [Thu, 17 Dec 2015 09:00:40 +0000 (18:00 +0900)] 
ARM: uniphier: support ProXstream2, PH1-LD6b boards in single defconfig

These boards are similar enough to be supported in a single defconfig
file.  Distinguish one from another by "DEVICE_TREE" from the command
line.  The how-to-build in doc/README.uniphier should be also updated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig
Masahiro Yamada [Thu, 17 Dec 2015 09:00:39 +0000 (18:00 +0900)] 
ARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig

These two are similar enough to be merged into a single
defconfig file.  Distinguish one from another by "DEVICE_TREE"
from the command line.  The how-to-build in doc/README.uniphier
should be also updated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: drop fdt_file from CONFIG_EXTRA_ENV_SETTINGS
Masahiro Yamada [Thu, 17 Dec 2015 09:00:38 +0000 (18:00 +0900)] 
ARM: uniphier: drop fdt_file from CONFIG_EXTRA_ENV_SETTINGS

Now this environment is run-time set to the DTB name U-Boot is really
running with.  Drop the static define.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: set DTB file name to fdt_file environment
Masahiro Yamada [Thu, 17 Dec 2015 09:00:37 +0000 (18:00 +0900)] 
ARM: uniphier: set DTB file name to fdt_file environment

When we want to boot Linux with a DTB file downloaded from a TFTP
server or somewhere, we need to know the file name to be downloaded.

Assume the U-Boot configuration is shared among some similar boards.
If they are similar enough, the difference only appears in device
trees.  The build procedure would be like this:

 - Board A:  make foo_common_defconfig && make DEVICE_TREE=foo_board_a
 - Board B:  make foo_common_defconfig && make DEVICE_TREE=foo_board_b
 - Board C:  make foo_common_defconfig && make DEVICE_TREE=foo_board_c

In this case, the U-Boot image contains nothing about the DTB file name
it is running with.  (CONFIG_DEFAULT_DEVICE_TREE is not helpful for this
purpose because it is painful to change it from "make menuconfig" for
each board.)

This commit allows to lookup the DTB file name based on the compatible
string and set it to "fdt_file" environment.  Then "tftpboot $fdt_file"
will download the file we want.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: merge umc/ and ddrphy/ into a single directory
Masahiro Yamada [Thu, 17 Dec 2015 08:47:47 +0000 (17:47 +0900)] 
ARM: uniphier: merge umc/ and ddrphy/ into a single directory

The UMC (Universal Memory Controller) and the DDR PHY block are
highly related to each other.  It is better to have both code in the
same directory.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: display model number all the time on boot up
Masahiro Yamada [Thu, 17 Dec 2015 08:47:46 +0000 (17:47 +0900)] 
ARM: uniphier: display model number all the time on boot up

Both "Model 1" and "Model 2" are supported for ProXstream2 and
PH1-LD6b boards.  It is useful to show the model number in the
boot banner.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: add macros and revision IDs for sLD11 and LD10
Masahiro Yamada [Thu, 17 Dec 2015 08:47:45 +0000 (17:47 +0900)] 
ARM: uniphier: add macros and revision IDs for sLD11 and LD10

These are new SoCs from Socionext Inc.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: compile uniphier_get_board_param() for U-Boot proper
Masahiro Yamada [Thu, 17 Dec 2015 08:47:44 +0000 (17:47 +0900)] 
ARM: uniphier: compile uniphier_get_board_param() for U-Boot proper

Compile this file for U-Boot proper as well as SPL, so that the
U-Boot proper can call uniphier_get_board_param().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
8 years agoARM: uniphier: split ProXstream2 board data and change DDR frequency
Masahiro Yamada [Thu, 17 Dec 2015 08:47:43 +0000 (17:47 +0900)] 
ARM: uniphier: split ProXstream2 board data and change DDR frequency

The DDR3 memory chips on ProXstream2 boards support up to 2133 MHz,
while only up to 1866MHz on PH1-LD6b boards.

Split the board data structure and change the DDR frequency of
ProXstream2 boards to 2133 MHz.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>