project/bcm63xx/u-boot.git
10 years agosama5d3xek: support larger than 4G nand flash
Wu, Josh [Fri, 18 Oct 2013 09:46:32 +0000 (17:46 +0800)]
sama5d3xek: support larger than 4G nand flash

Signed-off-by: Josh Wu <josh.wu@atmel.com>
10 years agomtd: atmel_nand: enable PMECC support for 8k bytes page NAND flash
Wu, Josh [Fri, 18 Oct 2013 09:46:31 +0000 (17:46 +0800)]
mtd: atmel_nand: enable PMECC support for 8k bytes page NAND flash

increase the delay to 75us to support the 8k bytes page nand flash

Signed-off-by: Josh Wu <josh.wu@atmel.com>
10 years agoboard/c29xpcie: Add support of 8K page size NAND flash
Prabhakar Kushwaha [Fri, 4 Oct 2013 04:35:50 +0000 (10:05 +0530)]
board/c29xpcie: Add support of 8K page size NAND flash

Defines constants required to support 8K page size NAND flash.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agomtd/ifc: Add support of 8K page size NAND flash
Prabhakar Kushwaha [Fri, 4 Oct 2013 04:35:36 +0000 (10:05 +0530)]
mtd/ifc: Add support of 8K page size NAND flash

Current IFC driver supports till 4K page size NAND flash.
Add support of 8K NAND flash
  - Program Spare region size in csor_ext
  - Add nand_ecclayout for 4 bit & 8 bit ecc
  - Defines constants
  - Add support of 8K NAND boot.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
CC: Liu Po <po.liu@freescale.com>
10 years agomtd: move & update nand_ecclayout structure (plus board changes)
Prabhakar Kushwaha [Fri, 4 Oct 2013 08:17:58 +0000 (13:47 +0530)]
mtd: move & update nand_ecclayout structure (plus board changes)

nand_ecclayout is present in mtd.h at Linux.
Move this structure to mtd.h to comply with Linux.

Also, increase the ecc placement locations to 640 to suport device having
writesize/oobsize of 8KB/640B. This means that the maximum oobsize has gone
up to 640 bytes and consequently the maximum ecc placement locations have
also gone up to 640.

Changes from Prabhabkar's version (squashed into one patch to preserve
bisectability):
 - Added _LARGE to MTD_MAX_*_ENTRIES

   This makes the names match current Linux source, and resolves
   a conflict between
   http://patchwork.ozlabs.org/patch/280488/
   and
   http://patchwork.ozlabs.org/patch/284513/

   The former was posted first and is closer to matching Linux, but
   unlike Linux it does not add _LARGE to the names.  The second adds
   _LARGE to one of the names, and depends on it in a subsequent patch
   (http://patchwork.ozlabs.org/patch/284512/).

 - Made max oobfree/eccpos configurable, and used this on tricorder,
   alpr, ASH405, T4160QDS, and T4240QDS (these boards failed to build
   for me without doing so, due to a size increase).

   On tricorder SPL, this saves 2576 bytes (and makes the SPL build
   again) versus the new default of 640 eccpos and 32 oobfree, and
   saves 336 bytes versus the old default of 128 eccpos and 8 oobfree.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
CC: Vipin Kumar <vipin.kumar@st.com>
[scottwood@freescale.com: changes as described above]
Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Thomas Weber <weber@corscience.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Stefan Roese <sr@denx.de>
Cc: York Sun <yorksun@freescale.com>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Stefan Roese <sr@denx.de>
10 years agodriver/mtd/ifc: Read Status while programming NAND flash
Prabhakar Kushwaha [Thu, 3 Oct 2013 06:05:35 +0000 (11:35 +0530)]
driver/mtd/ifc: Read Status while programming NAND flash

as per controller description,
  "While programming a NAND flash, status read should never skipped.
   Because it may happen that a new command is issued to the NAND Flash,
   even when the device has not yet finished processing the previous request.
   This may result in unpredictable behaviour."

IFC controller never polls for R/B signal after command send. It just return
control to software. This behaviour may not occur with NAND flash access.
because new commands are sent after polling R/B signal. But it may happen
in scenario where GPCM-ASIC and NAND flash device are working simultaneously.

Update the controller driver to take care of this requirement

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agoMTD: atmel_nand: support for software BCH ECC
Bo Shen [Wed, 28 Aug 2013 14:54:26 +0000 (14:54 +0000)]
MTD: atmel_nand: support for software BCH ECC

Add possible to use software BCH ECC for atmel nand driver

Signed-off-by: Bo Shen <voice.shen@gmail.com>
10 years agocm_t35: use scf0403 driver
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:29 +0000 (17:23 +0300)]
cm_t35: use scf0403 driver

Use scf0403 driver to add scf0403x LCD support for cm-t35 and cm-t3730
boards.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agoomap3_dss: define DSS_ONOFF
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:28 +0000 (17:23 +0300)]
omap3_dss: define DSS_ONOFF

Add DSS_ONOFF to polarity defines

Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Anatolij Gustschin <agust@denx.de>
10 years agolcd: add DataImage SCF0403x LCD panel support
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:27 +0000 (17:23 +0300)]
lcd: add DataImage SCF0403x LCD panel support

Add SPI-based driver for DataImage SCF0403852GGU04 and SCF0403526GGU20
LCD panels.

Cc: Tom Rini <trini@ti.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agospi: define SPI_XFER_ONCE
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:26 +0000 (17:23 +0300)]
spi: define SPI_XFER_ONCE

The flag combination "SPI_XFER_BEGIN | SPI_XFER_END" is a common use
case of spi_xfer, and it can easily cause an already long line (spi_xfer
takes 5 parameters) to go over the 80 character limit.

define SPI_XFER_ONCE to be a shorter version of the above flag combination.

Cc: Tom Rini <trini@ti.com>
Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agospi: omap3: add support for more word lengths
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:25 +0000 (17:23 +0300)]
spi: omap3: add support for more word lengths

Current implementation only supports 8 bit word lengths, even though
omap3 can handle anything between 4 and 32.

Update the spi interface to support changing the SPI word length,
and implement it in omap3_spi driver to support the full range of
possible word lengths.
This implementation is backwards compatible by defaulting to the old
behavior of 8 bit word lengths.
Also, it required a change to the omap3_spi non static I/O functions,
but since they are not used anywhere else, no collateral changes are required.

Cc: Tom Rini <trini@ti.com>
Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agospi: omap3: remove semicolon from #define
Nikita Kiryanov [Wed, 16 Oct 2013 14:23:24 +0000 (17:23 +0300)]
spi: omap3: remove semicolon from #define

Remove unnecessary semicolon from #define SPI_WAIT_TIMEOUT

Cc: Tom Rini <trini@ti.com>
Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Gerhard Sittig <gsi@denx.de>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agovideo: bcm2835: respect the pitch value
Andre Heider [Sat, 9 Nov 2013 10:07:53 +0000 (11:07 +0100)]
video: bcm2835: respect the pitch value

Depending on the firmware's video options [1] the active SDTV or
HDTV mode can yield a framebuffer with noncontiguous horizontal lines,
giving a messed up display, for both, u-boot and the loaded kernel.

Fix this by setting lcd_line_length to the pitch value of the configured
framebuffer.

[1] http://elinux.org/RPiconfig#Video_mode_options

Signed-off-by: Andre Heider <a.heider@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
10 years agolcd: allow overriding lcd_get_size()
Anatolij Gustschin [Sat, 9 Nov 2013 10:00:09 +0000 (11:00 +0100)]
lcd: allow overriding lcd_get_size()

Remove the redundant lcd_line_length initialisation which
sneaked in when an earlier version of the patch of commit
6d330719 has been rebased.

Some lcd drivers need to setup lcd_line_length not from the
panel_info parameters but by different means. Make the
lcd_get_size() weak to allow setting lcd_line_length in
a driver specific way.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
10 years agoARM: bcm2835: add missing mbox overscan response field
Andre Heider [Tue, 22 Oct 2013 20:27:20 +0000 (22:27 +0200)]
ARM: bcm2835: add missing mbox overscan response field

Add the missing "right" field to struct bcm2835_mbox_tag_overscan.

Signed-off-by: Andre Heider <a.heider@gmail.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoMPC824x: remove obsolete "PN62" board
Wolfgang Denk [Mon, 11 Nov 2013 19:12:19 +0000 (20:12 +0100)]
MPC824x: remove obsolete "PN62" board

The MPC824x processors have long reached EOL, and the PN62 board has
not seen any board-specific updates for more than a decade.  It is now
causing build issues.  Instead of wasting time on things nobody is
interested in any more, we rather drop this board.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
cc: Tom Rini <trini@ti.com>

11 years agotime: fix gcc warnings on MIPS64
Daniel Schwierzeck [Fri, 8 Nov 2013 23:30:14 +0000 (00:30 +0100)]
time: fix gcc warnings on MIPS64

Commit 8dfafdde88eb3e71d5569846396ae67a91017232 introduced
new gcc warnings on MIPS64:

time.c: In function 'tick_to_time':
time.c:59:2: warning: comparison of distinct pointer types lacks a cast [enabled by default]
time.c:59:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
In file included from time.c:10:0:
./u-boot-mips/include/div64.h:22:17: note: expected 'uint64_t *' but argument is of type 'long long unsigned int *'
time.c: In function 'usec_to_tick':
time.c:76:2: warning: comparison of distinct pointer types lacks a cast [enabled by default]
time.c:76:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
In file included from time.c:10:0:
./u-boot-mips/include/div64.h:22:17: note: expected 'uint64_t *' but argument is of type 'long long unsigned int *'

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mips
Tom Rini [Mon, 11 Nov 2013 14:40:34 +0000 (09:40 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mips

11 years agomalta: arch/mips/include/asm/malta.h SPDX license tag
Paul Burton [Mon, 11 Nov 2013 11:03:26 +0000 (11:03 +0000)]
malta: arch/mips/include/asm/malta.h SPDX license tag

This patch replaces the GPL-2.0 text with a GPL-2.0
SPDX-License-Identifier tag, and adds Imagination Technologies copyright
following my recent changes.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agoMerge branch 'iu-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sat, 9 Nov 2013 11:51:47 +0000 (12:51 +0100)]
Merge branch 'iu-boot/master' into 'u-boot-arm/master'

Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
board/compulab/cm_t35/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
drivers/bootcount/Makefile
include/configs/omap4_common.h
include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

board/compulab/common/Makefile
board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h

11 years agomalta: define CONFIG_MEMSIZE_IN_BYTES
Gabor Juhos [Thu, 24 Oct 2013 12:32:00 +0000 (14:32 +0200)]
malta: define CONFIG_MEMSIZE_IN_BYTES

The memsize environment variable must contain the
memory size in bytes on the Malta board. Otherwise
Linux will use wrong memory size which causes a kernel
panic.

Define CONFIG_MEMSIZE_IN_BYTES in malta.h to avoid
that.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: add myself to maintainers
Paul Burton [Fri, 8 Nov 2013 11:18:59 +0000 (11:18 +0000)]
malta: add myself to maintainers

This patch adds me as a maintainer of the malta(el) board(s). I have
access to physical Malta boards and the desire for U-boot to run well on
them.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: add script & instructions to flash U-boot
Paul Burton [Fri, 8 Nov 2013 11:18:58 +0000 (11:18 +0000)]
malta: add script & instructions to flash U-boot

This patch adds a script which may be used with MIPS Navigator Console
and a MIPS Nagivator Probe in order to flash U-boot to a MIPS Malta
development board.

Please see the newly added doc/README.malta for usage instructions.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: setup PIIX4 interrupt route
Paul Burton [Fri, 8 Nov 2013 11:18:57 +0000 (11:18 +0000)]
malta: setup PIIX4 interrupt route

Without setting up the PIRQ[A:D] interrupt routes, PCI interrupts will
be left disabled. Linux does not set up this routing but relies upon it
having been set up by the bootloader, reading back the IRQ lines which
the PIRQ[A:D] signals have been routed to.

This patch routes PIRQA & PIRQB to IRQ 10, and PIRQC & PIRQD to IRQ 11.
This matches the setup used by YAMON.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: store environment in flash
Paul Burton [Fri, 8 Nov 2013 11:18:56 +0000 (11:18 +0000)]
malta: store environment in flash

Allow the environment to be stored in the monitor flash of a Malta
board. The environment is stored in the final 128KB of the flash, which
both leaves the majority of the flash available for U-boot code and also
matches the location which YAMON uses.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: enable RTC support
Paul Burton [Fri, 8 Nov 2013 11:18:55 +0000 (11:18 +0000)]
malta: enable RTC support

This is actually required in order for a Linux kernel to boot
successfully on a physical Malta board. Without enabling the RTC, a
Malta Linux kernel will get stuck in its estimate_frequencies function
on boot.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: disable L2 caches
Paul Burton [Fri, 8 Nov 2013 11:18:54 +0000 (11:18 +0000)]
malta: disable L2 caches

Malta boards may be used with cores which support L2 caches, however
U-boot does not yet support L2 cache for MIPS. Thus for the moment we'll
disable L2 caches by setting the L2B bit in Config2. This is specific to
MTI/Imagination MIPS cores which is why this is done for the Malta board
rather than generically.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: remove cache size definitions
Paul Burton [Fri, 8 Nov 2013 11:18:53 +0000 (11:18 +0000)]
malta: remove cache size definitions

These will now be detected at runtime, allowing a single U-boot
configuration to function correctly with different bitstreams. Without
this you may need to re-configure, re-build and re-flash U-boot to your
Malta if you flash a new bitstream with a different cache configuration
to your old bitstream.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP
Paul Burton [Fri, 8 Nov 2013 11:18:52 +0000 (11:18 +0000)]
malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP

This model of the pcnet is used in current Malta boards, at least in the
Malta-R rev 3. Enable support for it.

The Malta also has the ethernet controller PROM containing its MAC
address, so enable support for that in order to read that MAC address.

DHCP is a very useful feature to have available for many networks,
enable support for it also.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: display "U-boot" on the LCD screen
Paul Burton [Fri, 8 Nov 2013 11:18:51 +0000 (11:18 +0000)]
malta: display "U-boot" on the LCD screen

Displaying a message on the LCD screen is a simple yet effective way to
show the user that the board has booted successfully.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: support for coreFPGA6 boards
Paul Burton [Fri, 8 Nov 2013 11:18:50 +0000 (11:18 +0000)]
malta: support for coreFPGA6 boards

This patch adds support for running on Malta boards using coreFPGA6
core cards, including support for the msc01 system controller used
with them. The system controller is detected at runtime allowing one
U-boot binary to run on a Malta with either.

Due to the PCI I/O base differing between Maltas using gt64120 & msc01
system controllers, the UART setup is modified slightly. A second UART
is added so that there is one pointing at the correct address for each
system controller. The Malta board then defines its own
default_serial_console function to select the correct one at runtime.
The incorrect UART will simply not function.

Tested on:
  - A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both
    with and without an L2 cache.
  - QEMU.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomalta: setup super I/O UARTs
Paul Burton [Fri, 8 Nov 2013 11:18:49 +0000 (11:18 +0000)]
malta: setup super I/O UARTs

On a real Malta the Super I/O needs to be configured before we are able
to access the UARTs. This patch performs that configuration, setting up
the UARTs in the same way that YAMON would.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agoqemu-malta: rename to just "malta"
Paul Burton [Sat, 9 Nov 2013 10:22:08 +0000 (10:22 +0000)]
qemu-malta: rename to just "malta"

This is in preparation for adapting this board to function correctly on
a physical MIPS Malta board. The board is moved into an "imgtec" vendor
directory at the same time in order to ready us for any other boards
supported by Imagination in the future.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agopci.h: allow inclusion in assembly source
Paul Burton [Fri, 8 Nov 2013 11:18:47 +0000 (11:18 +0000)]
pci.h: allow inclusion in assembly source

This patch simply #ifdef's out the C-specific parts of pci.h when it is
included by an assembly file. This will allow the macros it contains to
be used from assembly source as will be done in a followup commit adding
support for more modern MIPS Malta boards.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agopcnet: enable the NOUFLO feature
Paul Burton [Fri, 8 Nov 2013 11:18:46 +0000 (11:18 +0000)]
pcnet: enable the NOUFLO feature

On relatively slow boards (such as the MIPS Malta with an FPGA core
card) it can be extremely common for transmits to underflow - to the
point where it appears they simply do not work at all. Setting the
NOUFLO bit causes the ethernet controller to not begin transmission on
the wire until a transmit start point is reached. Setting that transmit
start point to the full packet will cause the controller to only
transmit the packet once it has buffered it entirely thus preventing any
transmit underflows from occuring and allowing the controller to
function on slower boards.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agopcnet: add cache flushing & invalidation
Paul Burton [Fri, 8 Nov 2013 11:18:45 +0000 (11:18 +0000)]
pcnet: add cache flushing & invalidation

Ensure that the view of memory from the CPU & the ethernet controller is
coherent at the various points where they exchange data. This prevents
stale data from being transmitted or received, and prevents the driver
from getting stuck waiting for the ethernet controller to update
descriptors when in reality it has but the old values are being read
from cache.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agopcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send
Paul Burton [Fri, 8 Nov 2013 11:18:44 +0000 (11:18 +0000)]
pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send

This should cause no change to the generated code, but is semantically
correct.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agopcnet: code style cleanup
Paul Burton [Fri, 8 Nov 2013 11:18:43 +0000 (11:18 +0000)]
pcnet: code style cleanup

Fix up the code to match Documentation/CodingStyle. This is mostly
removing extraneous spaces.

No functional change is intended.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agomips32: detect L1 cache sizes if they're not defined
Paul Burton [Fri, 8 Nov 2013 11:18:42 +0000 (11:18 +0000)]
mips32: detect L1 cache sizes if they're not defined

For boards such as the MIPS Malta with an FPGA core card it is desirable
to be able to detect the L1 cache sizes at runtime, since they are not
dependant upon the board but on the FPGA bitstream in use. This patch
performs that detection when the CONFIG_SYS_[DI]CACHE_SIZE macros are
not defined by the board configuration. In cases where the sizes are
detected this patch also removes the restriction that the I-cache &
D-cache line sizes must be the same, as this is not necessarily true.

If the cache sizes are defined by a configuration then they will be
hardcoded as before, so this patch will not add overhead to such
boards.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-usb
Tom Rini [Fri, 8 Nov 2013 20:25:29 +0000 (15:25 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-usb

11 years agosandbox: convert to common time functions
Rob Herring [Fri, 8 Nov 2013 14:40:44 +0000 (08:40 -0600)]
sandbox: convert to common time functions

Convert sandbox to use common time functions.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agotime: add weak annotation to timer_read_counter declaration
Rob Herring [Fri, 8 Nov 2013 14:40:43 +0000 (08:40 -0600)]
time: add weak annotation to timer_read_counter declaration

A weak annotation is needed in order to prevent link errors when
get_ticks is overridden. This fixes sandbox build.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agonetconsole loses 2nd character of input
Suriyan Ramasami [Wed, 16 Oct 2013 16:54:24 +0000 (09:54 -0700)]
netconsole loses 2nd character of input

Netconsole loses the second character when used as input by
either setenv stdin nc or setenv stdin serial,nc if using CONSOLE_CONSOLE_MUX

Before a nc_send_packet() to echo the input, a check is done to see if
nc_ether is valid. If its not, it waits for an arp request and then sends
the packet (which contains the first character of line to be displayed as
output). As part of reaping the arp request, the second character is consumed.
We protect this by making the call to NetLoop(NETCONS) between
input_recursion.

Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoserial: s5p: Staticize local functions
Axel Lin [Wed, 16 Oct 2013 01:47:13 +0000 (09:47 +0800)]
serial: s5p: Staticize local functions

Staticize local functions in s5p serial driver.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoenv: fix the env export varname
Pierre Aubert [Tue, 8 Oct 2013 12:20:27 +0000 (14:20 +0200)]
env: fix the env export varname

The env export command doesn't export the first variable of the list
since commit 5a31ea04c9ee5544fbb70ad7597ea4b294840eab
"env grep" - reimplement command using hexport_r()

Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
11 years agohighbank: set AUTOBOOT_KEYED_CTRLC config option
Mark Langsdorf [Tue, 10 Sep 2013 20:20:24 +0000 (15:20 -0500)]
highbank: set AUTOBOOT_KEYED_CTRLC config option

Let highbank users break into the autoboot script with ctrl-c.

Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
11 years agoautoboot: add an option to override keyed autoboot
Mark Langsdorf [Tue, 10 Sep 2013 20:20:23 +0000 (15:20 -0500)]
autoboot: add an option to override keyed autoboot

As originally implemented, setting the AUTOBOOT_KEYED config option will
prevent users from breaking into the autoboot script with ctrl-c. Restore
that option with a new config symbol.

Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
11 years agoserial: xuartlite: Staticize local functions
Axel Lin [Wed, 16 Oct 2013 01:45:56 +0000 (09:45 +0800)]
serial: xuartlite: Staticize local functions

Staticize local functions in xuartlite driver.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Stefan Roese <sr@denx.de>
Tested-by: Michal Simek <monstr@monstr.eu>
11 years agoserial: mxs_auart: Staticize local functions
Axel Lin [Tue, 15 Oct 2013 02:52:35 +0000 (10:52 +0800)]
serial: mxs_auart: Staticize local functions

Staticize local functions in mxs_auart driver.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agofs:fat: fix set file name function
Piotr Wilczek [Fri, 11 Oct 2013 13:43:33 +0000 (15:43 +0200)]
fs:fat: fix set file name function

Curently memcpy copies string without null terminating char because
function strlen returns only number of characters excluding
null terminating character. Replace memcpy with strcpy.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Tom Rini <trini@ti.com>
11 years agocmd_zfs: normalize 'file not found' errors
Luka Perkov [Wed, 9 Oct 2013 23:32:28 +0000 (01:32 +0200)]
cmd_zfs: normalize 'file not found' errors

Signed-off-by: Luka Perkov <luka@openwrt.org>
11 years agocmd_reiser: normalize 'file not found' errors
Luka Perkov [Wed, 9 Oct 2013 23:32:27 +0000 (01:32 +0200)]
cmd_reiser: normalize 'file not found' errors

Signed-off-by: Luka Perkov <luka@openwrt.org>
11 years agocmd_ubifs: normalize 'file not found' errors
Tim Harvey [Wed, 9 Oct 2013 23:32:26 +0000 (01:32 +0200)]
cmd_ubifs: normalize 'file not found' errors

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
11 years agoinclude: delete include/linux/config.h
Masahiro Yamada [Mon, 7 Oct 2013 07:04:18 +0000 (16:04 +0900)]
include: delete include/linux/config.h

Linux Kernel abolished include/linux/config.h long time ago.
(around version v2.6.18..v2.6.19)

We don't need to provide Linux copatibility any more.

This commit deletes include/linux/config.h
and fixes source files not to include this.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoconfig/sandbox: Add EFI and GPT support
Egbert Eich [Fri, 4 Oct 2013 17:44:07 +0000 (19:44 +0200)]
config/sandbox: Add EFI and GPT support

Signed-off-by: Egbert Eich <eich@suse.com>
11 years agoconfig: Define HAVE_BLOCK_DEVICE when CONFIG_CMD_GPT is set
Egbert Eich [Fri, 4 Oct 2013 17:42:53 +0000 (19:42 +0200)]
config: Define HAVE_BLOCK_DEVICE when CONFIG_CMD_GPT is set

Signed-off-by: Egbert Eich <eich@suse.com>
11 years agocmd/gpt: Support gpt command for all devices
Egbert Eich [Fri, 4 Oct 2013 16:53:04 +0000 (18:53 +0200)]
cmd/gpt: Support gpt command for all devices

The gpt command was only implemented for mmc devices. There is no reason
why this command should not be generalized and be applied all other
storage device classes.
This change both simplifies the implementation and eliminates a
build failure for systems that don't support mmcs.

Signed-off-by: Egbert Eich <eich@suse.com>
Tested-by: Piotr Wilczek <p.wilczek@samsung.com>
[trini: Change coding style slightly]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agocosmetic: UDM-net: clean up the remainders of dead driver
Masahiro Yamada [Tue, 24 Sep 2013 01:32:06 +0000 (10:32 +0900)]
cosmetic: UDM-net: clean up the remainders of dead driver

This commit omits non-existing drivers/net/netarm_eth.c from the list.
This driver is deleted by commit b411eb30f.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocosmetic: UDM-serial: clean up the remainders of dead driver
Masahiro Yamada [Tue, 24 Sep 2013 01:32:05 +0000 (10:32 +0900)]
cosmetic: UDM-serial: clean up the remainders of dead driver

The following serial drivers do not exist any more.

 - ns9750_serial.c: deleted by commit 4cfc611b4
 - s3c4510b_uart.c: deleted by commit afad40299
 - serial_clps7111.c: deleted by commit f2e080156
 - serial_netarm.c: deleted by commit b411eb30f

This commit cleans up UDM-serial.txt.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocosmetic: doc: driver-model: Do not number driver lists
Masahiro Yamada [Tue, 24 Sep 2013 01:32:04 +0000 (10:32 +0900)]
cosmetic: doc: driver-model: Do not number driver lists

Everytime a dead driver is removed from the list,
we must re-number. This is a painful task.

Try
  git show e53232250 -- doc/driver-model/UDM-serial.txt
  git show 6f62f4207 -- doc/driver-model/UDM-serial.txt
  git show b9f4bc34a -- doc/driver-model/UDM-serial.txt
to see what I mean.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agousb: dfu: make nand upload working
Bo Shen [Thu, 7 Nov 2013 06:29:41 +0000 (14:29 +0800)]
usb: dfu: make nand upload working

Nowhere pass a value to len, which always 0, make no transfer which
cause uploading failed.

This patch make nand upload working. However it needs enough malloc
buffer to store read data, that means the buffer at least equal to
the upload partition size, or else it doesn't work.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
11 years agousb, g_dnl: make iSerialNumber board configurable
Heiko Schocher [Mon, 4 Nov 2013 13:05:01 +0000 (14:05 +0100)]
usb, g_dnl: make iSerialNumber board configurable

add the possibility to set the iSerialNumber board specific.
Default value for iSerialNumber is 0x0. This value can
changed board specific through the new function
g_dnl_set_serialnumber() which must be called from the
board specific function g_dnl_bind_fixup().

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agousb: dfu: correct dfu buffer inited value
Bo Shen [Wed, 16 Oct 2013 09:26:38 +0000 (17:26 +0800)]
usb: dfu: correct dfu buffer inited value

After dfu buffer is initialized, the buffer should be all available,
while not 0. Initialize its value to min(dfu_buf_size, dfu->r_left).

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agousb: dfu: decrease dfu->r_left along with the transfer
Bo Shen [Wed, 16 Oct 2013 09:26:37 +0000 (17:26 +0800)]
usb: dfu: decrease dfu->r_left along with the transfer

The value of dfu->r_left need decrease along with the transfer

Signed-off-by: Bo Shen <voice.shen@atmel.com>
11 years agousb: ohci-hcd: submit_common_msg: report actual_length properly
Mateusz Kulikowski [Wed, 23 Oct 2013 18:26:27 +0000 (20:26 +0200)]
usb: ohci-hcd: submit_common_msg: report actual_length properly

submit_common_msg should report amount of data passed from/to device.
Instead, it always returned size requested by Host.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
11 years agousb: ums: add ums exit feature by ctrl+c or by detach usb cable
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:46 +0000 (14:30 +0200)]
usb: ums: add ums exit feature by ctrl+c or by detach usb cable

This patch allows exiting from UMS mode to u-boot prompt
by detaching usb cable or by pressing ctrl+c.

Add new config: CONFIG_USB_CABLE_CHECK. If defined then board
file should provide function: usb_cable_connected() (include/usb.h)
that return 1 if cable is connected and 0 otherwise.

Changes v2:
- add a note to the README

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
11 years agousb: ums: move ums code from trats to Samsung common directory
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:45 +0000 (14:30 +0200)]
usb: ums: move ums code from trats to Samsung common directory

UMS init was implemented in trats board file but mostly it comprises
common code. Due to that it has been moved to common/ums.c to avoid
code duplication in the future.

Changes:
- move ums initialization code from trats to common/ums.c
- remove unused CONFIG_USB_GADGET_MASS_STORAGE from trats.h

Changes v2:
- move this patch at the top of code cleanups patches

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Minkyu Kang <mk7.kang@samsung.com>
11 years agousb: ums: fix disk capacity miscalculation and code cleanup
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:44 +0000 (14:30 +0200)]
usb: ums: fix disk capacity miscalculation and code cleanup

This patch prevents:
- ums disk capacity miscalculation because of integer overflow

Changes v2:
- Prevents passing zero size disk capacity to ums gadget driver
- Change function ums_get_capacity() to ums_disk_init() and do ums disk
  initialization before gadget init
- Remove unnecessary code from mass storage driver

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
11 years agousb: ums: allows using every mmc device with ums.
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:43 +0000 (14:30 +0200)]
usb: ums: allows using every mmc device with ums.

Before this change ums command only allowed use of mmc 0.
Now this argument can be set.

Changes:
- remove mmc device number checking because it is always positive number
- remove printing "no such device" - it is done by find_mmc_device()

Change-Id: I767e45151ad515c7bef19e6c13087374f5e23c11
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marex@denx.de>
11 years agousb: ums: code refactoring to improve reusability on other boards.
Przemyslaw Marczak [Wed, 23 Oct 2013 12:30:42 +0000 (14:30 +0200)]
usb: ums: code refactoring to improve reusability on other boards.

This patch introduces some cleanups to ums code. Changes:

ums common:
- introduce UMS_START_SECTOR and UMS_NUM_SECTORS as defined in
  usb_mass_storage.h both default values as 0 if board config
  doesn't define them

common cleanup changes:
- change name of struct "ums_board_info" to "ums"
- "ums_device" fields are moved to struct ums and "dev_num" is removed
- change function name: board_ums_init to ums_init
- remove "extern" prefixes from usb_mass_storage.h

cmd_usb_mass_storage:
- change error() to printf() if need to print info message
- change return values to command_ret_t type at ums command code
- add command usage string

Changes v2:
ums common:
- always returns number of read/write sectors
- coding style clean-up
ums gadget:
- calculate amount of read/write from device returned value.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
11 years agoREADME: remove wrong config name
Igor Grinberg [Wed, 6 Nov 2013 15:24:02 +0000 (17:24 +0200)]
README: remove wrong config name

There is no CONFIG_PCA953X_INFO symbol.
U-Boot uses CONFIG_CMD_PCA953X_INFO instead, which is described in
"Monitor Functions" section and thus no need to be repeated in the
"GPIO Support" section.
Remove the whole line.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agocosmetic: remove empty lines at the top of file
Masahiro Yamada [Tue, 5 Nov 2013 02:28:48 +0000 (11:28 +0900)]
cosmetic: remove empty lines at the top of file

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocommon/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions
Miao Yan [Mon, 4 Nov 2013 03:18:14 +0000 (11:18 +0800)]
common/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions

In commit "5c427e4: use BOOTM_STATE_OS_CMDLINE flag for plain bootm"
and "3d187b3: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS",
BOOTM_STATE_OS_CMDLINE was added to do_bootm for PowerPC and MIPS. This
breaks other OSes (vxworks, netbsd, plan9,...) that don't support
subcommand processing, e.g. they all contain the following code in their
do_bootm_xxx():

    if (flag & BOOTM_STATE_OS_PREP)
            return 0;
    if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
            return 1;

which will result a "subcommand not supported" error.
This patch changes the above logic to:

    /* if not go command, pretend everything to be OK */
    if (flag != BOOTM_STATE_OS_GO)
         return 0;

Signed-off-by: Miao Yan <miao.yan@windriver.com>
11 years agoMakefile: do not create a symbolic link to arch/${ARCH}/include/asm
Masahiro Yamada [Fri, 1 Nov 2013 01:28:45 +0000 (10:28 +0900)]
Makefile: do not create a symbolic link to arch/${ARCH}/include/asm

In-tree build:
  - Do not create a symbolic link
      from include/asm to arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Out-of-tree build:
  - Do not create a directory ${OBJTREE}/include2
  - Do not create a symbolic link
      from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoAdd support for SX151x SPI GPIO Expanders
Viktar Palstsiuk [Thu, 31 Oct 2013 08:16:59 +0000 (11:16 +0300)]
Add support for SX151x SPI GPIO Expanders

Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
11 years agoboards.cfg: remove git leftovers
Luka Perkov [Thu, 31 Oct 2013 02:59:46 +0000 (03:59 +0100)]
boards.cfg: remove git leftovers

Remove 'HEAD' line which is most likely left there while rebasing. It was
introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0.

Signed-off-by: Luka Perkov <luka@openwrt.org>
11 years agoboards.cfg: remove trailing whitespace
Paul Burton [Wed, 23 Oct 2013 10:17:14 +0000 (11:17 +0100)]
boards.cfg: remove trailing whitespace

Commit 93e14596 "Coding Style cleanup: replace leading SPACEs by TABs"
added trailing whitespace to a single line of boards.cfg. I presume this
was unintentional, and it causes the file to change after running it
through the reformat.py script. Remove the offending character.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agocmd_nvedit.c: Add env exists command
Andrew Ruder [Wed, 23 Oct 2013 00:07:34 +0000 (19:07 -0500)]
cmd_nvedit.c: Add env exists command

env exists is a way to test (in hush) if an environment variable
exists.  A workaround existed using printenv but this new command
doesn't require all the stdout/stderr redirection to prevent
printing information to the screen.

Example:
$ set testexists 1
$ env exists testexists && echo "yes"
yes
$ env exists testexists || echo "no"
$ set testexists
$ env exists testexists && echo "yes"
$ env exists testexists || echo "no"
no
$

Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
11 years agoMAKEALL: rename boards_by_* functions to targets_by_*
Masahiro Yamada [Mon, 21 Oct 2013 02:11:28 +0000 (11:11 +0900)]
MAKEALL: rename boards_by_* functions to targets_by_*

We expect boards_by_* function to return the 7th filed, 'Target',
not the 6th field, 'Board name'.

So the function names, boards_by_* are a little misleading,
and should be renamed to targets_by_*.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoMAKEALL: fix boards_by_field function
Masahiro Yamada [Mon, 21 Oct 2013 02:11:27 +0000 (11:11 +0900)]
MAKEALL: fix boards_by_field function

Commit 27af930e changed the boards.cfg format
and it changed boards_by_field() function incorrectly.
For tegra cpus it returned Board Name field,
not Target field.

This commit restores the behavior prior to 27af930e in the right way.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoMAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:26 +0000 (11:11 +0900)]
MAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>

Commit 27af930e changed the boards.cfg format but
missed to change get_target_arch() fuction.
This commit adjusts it for CROSS_COMPILE_<ARCH>
to work correctly.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoMAKEALL: fix awk warning message
Masahiro Yamada [Mon, 21 Oct 2013 02:11:25 +0000 (11:11 +0900)]
MAKEALL: fix awk warning message

If you do `./MAKEALL -M ` or `./MAKEALL -m`
GNU awk would display warnings like follows:

    awk: warning: escape sequence `\ ' treated as plain ` '

In the first place, we do not explicitly set the field separator.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agosparc: include config.h to start.S
Masahiro Yamada [Mon, 21 Oct 2013 01:19:38 +0000 (10:19 +0900)]
sparc: include config.h to start.S

arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES
to be defined:

  #ifndef CONFIG_SYS_SPARC_NWINDOWS
  #error Must define number of SPARC register windows, default is 8
  #endif

But it missed to include <config.h>, which always ended up in compile error.

This commit fixes this problem.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
11 years agoEP88x: remove remainders of dead board
Masahiro Yamada [Mon, 21 Oct 2013 01:10:32 +0000 (10:10 +0900)]
EP88x: remove remainders of dead board

Commit 1b0757e deleted the EP88x entry from boards.cfg file.
But it missed to remove include/configs/EP88x.h and board/ep88x/.

This commit removes them and adds EP88x to README.scrapyard.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
11 years agoREADME.scrapyard: fix broken format
Masahiro Yamada [Mon, 21 Oct 2013 01:10:31 +0000 (10:10 +0900)]
README.scrapyard: fix broken format

Some tabs have been replaced with spaces
because doc/README.scrapyard is consistently using spaces.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agokup: Delete an unused Makefile
Masahiro Yamada [Mon, 21 Oct 2013 01:01:24 +0000 (10:01 +0900)]
kup: Delete an unused Makefile

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Klaus Heydeck <heydeck@kieback-peter.de>
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 7 Nov 2013 08:32:16 +0000 (09:32 +0100)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Tom Rini [Wed, 6 Nov 2013 21:18:25 +0000 (16:18 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-coldfire

11 years agoMerge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Wed, 6 Nov 2013 21:11:34 +0000 (16:11 -0500)]
Merge branch 'fpga' of git://denx.de/git/u-boot-microblaze

11 years agoColdFire: fix some typoes for CF platform
jason [Wed, 6 Nov 2013 14:59:08 +0000 (22:59 +0800)]
ColdFire: fix some typoes for CF platform

Signed-off-by: Jason Jin <Jason.Jin@freescale.com>
11 years agocoldfire: cpu5282: increase malloc space to fix crash on start u-boot
Jens Scharsig (BuS Elektronik) [Mon, 23 Sep 2013 06:26:41 +0000 (08:26 +0200)]
coldfire: cpu5282: increase malloc space to fix crash on start u-boot

The malloc space is to small to boot, the current uboot 2013.10-rcX,
This will fix the startup problems by increasing the mallog space to 4MiB.

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
11 years agoMakfile: fix a rule to build u-boot.sb
Masahiro Yamada [Tue, 5 Nov 2013 08:09:02 +0000 (17:09 +0900)]
Makfile: fix a rule to build u-boot.sb

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agofreescale: p1_p2_rdb_pc: rename COBJS-y to obj-y
Masahiro Yamada [Tue, 5 Nov 2013 08:03:22 +0000 (17:03 +0900)]
freescale: p1_p2_rdb_pc: rename COBJS-y to obj-y

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agofpga: Add support for gzip images with bitstreams
Michal Simek [Fri, 4 Oct 2013 08:51:01 +0000 (10:51 +0200)]
fpga: Add support for gzip images with bitstreams

Here is the set of command which has been performed
to proof this feature.

gzip < fpga.bin > fpga.bin.gz
mkimage -A arm -O u-boot -T firmware -C gzip \
-a 20000000 -n "zc702_fpga_bin" -d fpga.bin.gz fpga.bin.gz.ub

tftp 100000 fpga.bin.gz.ub
fpga loadmk 0 100000

This flow should speedup loading bitstream data
from external memory and save image footprint in non volatile
memory.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agofpga: zynqpl: Do not place bitstream below 1MB
Michal Simek [Fri, 4 Oct 2013 08:48:59 +0000 (10:48 +0200)]
fpga: zynqpl: Do not place bitstream below 1MB

DMA doesn't work when src is placed below 1MB limit.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agofpga: zynqpl: Add dcache flush support
Jagannadha Sutradharudu Teki [Fri, 20 Sep 2013 13:09:47 +0000 (18:39 +0530)]
fpga: zynqpl: Add dcache flush support

Buffers must be cache and dma aligned.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoMerge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

11 years agoat91: add defines for reset type
Roger Meier [Mon, 4 Nov 2013 06:40:44 +0000 (07:40 +0100)]
at91: add defines for reset type

Signed-off-by: Roger Meier <r.meier@siemens.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot target
Jens Scharsig (BuS Elektronik) [Mon, 28 Oct 2013 09:58:15 +0000 (10:58 +0100)]
ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot target

Since more functions are enabled,  the  eb_cpux9k2_ram target does not boot.
This patch changed the TEXT_BASE, that the code fits between TEXT_BASE and ram end.

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>