oweals/u-boot.git
10 years agommc/dwmmc: use bounce buffer for data exchange between CPU and MMC controller
Alexey Brodkin [Thu, 26 Dec 2013 11:29:07 +0000 (15:29 +0400)]
mmc/dwmmc: use bounce buffer for data exchange between CPU and MMC controller

Bounce buffer implementation takes care of proper data buffer alignemt
and correct flush/invalidation of data cache at once so we no longer
depend on input data variety and make sure CPU and MMC controller deal
with expected data in case of enabled data cache.

Bounce buffer requires to add its definition (CONFIG_BOUNCE_BUFFER) in
board configuration, otherwise corresponding library won't be compiled
and linker will fail to build resulting executable.

Difference since v1 - fixed compile-time warning with type casting to
"void *":

Slight edit to remove UTF8 characters in the commit message.

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
====
passing argument 2 of 'bounce_buffer_start' discards 'const' qualifier
from pointer target type
====

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Cc: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Amar <amarendra.xt@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Andy Fleming <afleming@gmail.com>
10 years agoARM: omap5_uevm: Enable 8-bit eMMC access
Lubomir Popov [Thu, 19 Dec 2013 15:14:02 +0000 (17:14 +0200)]
ARM: omap5_uevm: Enable 8-bit eMMC access

All prerequisites are already available, so why not enable 8-bit
access - it is a matter of a define in the board file only.

Signed-off-by: Lubomir Popov <l-popov@ti.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
10 years agommc/dwmmc: Using calloc instead malloc
Chin Liang See [Wed, 18 Dec 2013 17:16:01 +0000 (11:16 -0600)]
mmc/dwmmc: Using calloc instead malloc

To enhance the SDMMC DesignWare driver to use calloc instead of
malloc. This will avoid the incident that uninitialized members
of mmc structure are later used for NULL comparison.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Andy Fleming <afleming@freescale.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
10 years agoinclude/mmc.h: Remove declaration for spl_mmc_load()
Lad, Prabhakar [Tue, 3 Dec 2013 06:47:34 +0000 (12:17 +0530)]
include/mmc.h: Remove declaration for spl_mmc_load()

The spl_mmc_load() was removed while converting to
CONFIG_SPL_FRAMEWORK usage the definition was removed
but the declaration was missed. This patch removes this
declaration.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Mon, 6 Jan 2014 19:07:08 +0000 (14:07 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-onenand
Tom Rini [Mon, 6 Jan 2014 18:48:36 +0000 (13:48 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-onenand

10 years agoboard/t1040qds: Enable memory reset control
Prabhakar Kushwaha [Thu, 26 Dec 2013 07:10:55 +0000 (12:40 +0530)]
board/t1040qds: Enable memory reset control

Define QIXIS_RST_FORCE_MEM to reset on-board DDR-DIMM before start
accessing it.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agopowerpc/b4860/pbl: fix rcw cfg
Shaohui Xie [Thu, 19 Dec 2013 05:38:11 +0000 (13:38 +0800)]
powerpc/b4860/pbl: fix rcw cfg

The BOOT_LOC setting in rcw cfg is wrong, set it to Memory complex 1.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
10 years agopowerpc/t4240: enable NAND boot support
Shaohui Xie [Wed, 18 Dec 2013 07:09:57 +0000 (15:09 +0800)]
powerpc/t4240: enable NAND boot support

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
10 years agopowerpc/cms700: limit NAND data structure size
Scott Wood [Wed, 18 Dec 2013 04:11:07 +0000 (22:11 -0600)]
powerpc/cms700: limit NAND data structure size

This fixes a build break due to excessively large NAND data structures.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
10 years agopowerpc/t208x: fix macro CONFIG_SYS_FSL_NUM_USB_CTRLS
Shengzhou Liu [Wed, 18 Dec 2013 02:27:55 +0000 (10:27 +0800)]
powerpc/t208x: fix macro CONFIG_SYS_FSL_NUM_USB_CTRLS

CONFIG_SYS_FSL_NUM_USB_CTRLS is no longer used,
update it to new CONFIG_USB_MAX_CONTROLLER_COUNT.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
10 years agopowerpc/B4860QDS: Define new nand_ecclayout structure macros
York Sun [Tue, 17 Dec 2013 19:21:09 +0000 (11:21 -0800)]
powerpc/B4860QDS: Define new nand_ecclayout structure macros

Define CONFIG_SYS_NAND_MAX_ECCPOS and CONFIG_SYS_NAND_MAX_OOBFREE to
reduce the image size, by taking advantage of the new nand_ecclayout
structure.

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Prabhakar Kushwaha <prabhakar@freescale.com>
CC: Scott Wood <scottwood@freescale.com>
10 years agopowerpc/P1022DS: Define new nand_ecclayout structure macros
York Sun [Tue, 17 Dec 2013 19:21:08 +0000 (11:21 -0800)]
powerpc/P1022DS: Define new nand_ecclayout structure macros

Define CONFIG_SYS_NAND_MAX_ECCPOS and CONFIG_SYS_NAND_MAX_OOBFREE to
reduce the image size, by taking advantage of the new nand_ecclayout
structure.

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Prabhakar Kushwaha <prabhakar@freescale.com>
CC: Scott Wood <scottwood@freescale.com>
10 years agopowerpc/mpc85xx: Add support for single source clocking
Priyanka Jain [Tue, 17 Dec 2013 08:55:52 +0000 (14:25 +0530)]
powerpc/mpc85xx: Add support for single source clocking

Single-source clocking is new feature introduced in T1040.
In this mode, a single differential clock is supplied to the
DIFF_SYSCLK_P/N inputs to the processor, which in turn is
used to supply clocks to the sysclock, ddrclock and usbclock.

So, both ddrclock and syclock are driven by same differential
sysclock in single-source clocking mode whereas in normal clocking
mode, generally separate DDRCLK and SYSCLK pins provides
reference clock for sysclock and ddrclock

DDR_REFCLK_SEL rcw bit is used to determine DDR clock source
-If DDR_REFCLK_SEL rcw bit is 0, then DDR PLLs are driven in
 normal clocking mode by DDR_Reference clock

-If DDR_REFCLK_SEL rcw bit is 1, then DDR PLLs are driven in
 single source clocking mode by DIFF_SYSCLK

Add code to determine ddrclock based on DDR_REFCLK_SEL rcw bit.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
10 years agoboard/t1040qds: Relax IFC FPGA timings
Prabhakar Kushwaha [Thu, 12 Dec 2013 06:39:01 +0000 (12:09 +0530)]
board/t1040qds: Relax IFC FPGA timings

Current IFC-FPGA TCH(Chip Select hold time with respect to WE deassertion)
is 0 i.e. 0 ns hold time on writes. This may not work on higher clock
freqencies.

So, Increase TCH as 0x8 i.e. 8 ip_clk.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agoboard/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL
Prabhakar Kushwaha [Wed, 11 Dec 2013 07:12:11 +0000 (12:42 +0530)]
board/freescale:Remove use of CONFIG_SPL_NAND_MINIMAL

CONFIG_SPL_NAND_MINIMAL should not be used as it was defined for temporary
review purpose.

So, use CONFIG_SPL_NAND_BOOT config.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agoboard/t1040qds: Fix typo in t1040_pbi.cfg file
Prabhakar Kushwaha [Tue, 10 Dec 2013 07:43:10 +0000 (13:13 +0530)]
board/t1040qds: Fix typo in t1040_pbi.cfg file

T1040QDS has 256KB SRAM. Comment is showing wrong information.

So update the comment.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agomtd: onenand: Fix unaligned access
Marek Vasut [Thu, 26 Dec 2013 00:01:24 +0000 (01:01 +0100)]
mtd: onenand: Fix unaligned access

Fix unaligned access in OneNAND core. The problem is that the ffchars[] array
is an array of "unsigned char", but in onenand_write_ops_nolock() can be passed
to the memcpy_16() function. The memcpy_16() function will treat the buffer as
an array of "unsigned short", thus triggering unaligned access if the compiler
decided ffchars[] to be not aligned.

I managed to trigger the problem with regular ELDK 5.4 GCC compiler.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Tom Rini <trini@ti.com>
10 years agoPowerPC: Drop linkstation_HGLAN support
Tom Rini [Fri, 20 Dec 2013 16:24:07 +0000 (11:24 -0500)]
PowerPC: Drop linkstation_HGLAN support

With changes to the rtl8169 ethernet to improve cache support, we have
needed additional cache functions for mpc8245.  As the board maintainer
has been unresponsive, remove this board.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoARM: Samsung: Change GONI and Universal_C210 maintainers.
Łukasz Majewski [Wed, 11 Dec 2013 06:15:42 +0000 (07:15 +0100)]
ARM: Samsung: Change GONI and Universal_C210 maintainers.

Update boards.cfg entries for Samsung's GONI and Universal_C210 maintainers
entry.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Thu, 19 Dec 2013 19:22:12 +0000 (14:22 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-spi

10 years agodriver: mtd: sf_ops: claim bus while doing memcpy
Poddar, Sourav [Thu, 14 Nov 2013 15:31:15 +0000 (21:01 +0530)]
driver: mtd: sf_ops: claim bus while doing memcpy

claim spi bus while doing memory copy, this will set up
the spi controller device control register before doing
a memory read.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Yebio Mesfin <ymesfin@ti.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
10 years agoconfig: dra7_evm: Add Bank Address Register(BAR) config
Poddar, Sourav [Thu, 14 Nov 2013 15:31:14 +0000 (21:01 +0530)]
config: dra7_evm: Add Bank Address Register(BAR) config

Add config to support bank address register.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Yebio Mesfin <ymesfin@ti.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Tom Rini [Wed, 18 Dec 2013 23:45:39 +0000 (18:45 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Wed, 18 Dec 2013 20:06:43 +0000 (15:06 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

10 years agousb: ehci: Fix register access
Marek Vasut [Sat, 14 Dec 2013 01:04:52 +0000 (02:04 +0100)]
usb: ehci: Fix register access

Fix the register access in EHCI HCD. We need to use address of the register
as an ehci_writel() argument.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
10 years agousb: ehci: Do not de-init uninited controllers
Marek Vasut [Sat, 14 Dec 2013 01:03:11 +0000 (02:03 +0100)]
usb: ehci: Do not de-init uninited controllers

In case the controller is not initialized, we shall not de-initialize it.
As the control structure will not be filled, we will produce a null ptr
dereference if the controller is not inited.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
10 years agousb: ehci-pci: Clarify and cleanup the EHCI controller detection
Marek Vasut [Fri, 13 Dec 2013 22:36:33 +0000 (23:36 +0100)]
usb: ehci-pci: Clarify and cleanup the EHCI controller detection

The detection function of the EHCI PCI controller was really cryptic,
add a beefy comment and clean the portion of the code up a bit. No
change in the logic of the code.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
10 years agoARM: trats: dfu: Enable default Poll Timeout for Trats board
Lukasz Majewski [Mon, 9 Dec 2013 15:20:16 +0000 (16:20 +0100)]
ARM: trats: dfu: Enable default Poll Timeout for Trats board

Provide default Poll Timeout value for Trats board.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
10 years agousb: f_dfu: cosmetic: Code cleanup
Lukasz Majewski [Mon, 9 Dec 2013 15:20:15 +0000 (16:20 +0100)]
usb: f_dfu: cosmetic: Code cleanup

Code cleanup for dfu_bind_config function

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
10 years agousb: dfu: f_dfu: Provide infrastructure to adjust DFU's Poll Timeout value
Lukasz Majewski [Mon, 9 Dec 2013 15:20:14 +0000 (16:20 +0100)]
usb: dfu: f_dfu: Provide infrastructure to adjust DFU's Poll Timeout value

It is necessary to deter the host from sending subsequent DFU_GETSTATUS
request in the case of e.g. writing the buffer to medium.

Here the timeout is increased when we fill up the whole buffer. This delay
allows eMMC memory to perform its internal operations.
Otherwise we end up with HOST's error regarding GET_STATUS receive timeout.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
10 years agodfu: Export allocated dfu buffer size
Lukasz Majewski [Mon, 9 Dec 2013 15:20:13 +0000 (16:20 +0100)]
dfu: Export allocated dfu buffer size

The method for exporting size of allocated buffer is provided.
It is afterwards used by USB's dfu function code.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
10 years agospi: tegra: clear RDY bit prior to every transfer
Yen Lin [Wed, 18 Dec 2013 18:18:46 +0000 (11:18 -0700)]
spi: tegra: clear RDY bit prior to every transfer

The RDY bit indicates that a transfer is complete. This needs to be
cleared by SW before every single HW transaction, rather than only
at the start of each SW transaction (those being made up of n HW
transactions).

It seems that earlier HW may have cleared this bit autonomously when
starting a new transfer, and hence this code was not needed in practice.
However, this is generally a good idea in all cases. In Tegra124, the
HW behaviour appears to have changed, and SW must explicitly clear this
bit. Otherwise, SW will believe that transfers have completed when they
have not, and may e.g. read stale data from the RX FIFO.

Signed-off-by: Yen Lin <yelin@nvidia.com>
[swarren, rewrote commit description, unified duplicate RDY clearing code
and moved it right before the start of the HW transaction, unconditionally
exit loop after reading RX data, rather than checking if TX FIFO is empty,
since it is guaranteed to be]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
10 years agospi: Add support SH Quad SPI driver
Nobuhiro Iwamatsu [Wed, 18 Dec 2013 06:31:55 +0000 (15:31 +0900)]
spi: Add support SH Quad SPI driver

This patch adds a driver for Renesas SoC's Quad SPI bus.
This supports with 8 bits per transfer to use with SPI flash.

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
10 years agosf: probe: add support for MX25L2006E
Luka Perkov [Mon, 28 Oct 2013 09:27:17 +0000 (10:27 +0100)]
sf: probe: add support for MX25L2006E

Add support for Macronix MX25L2006E SPI flash.

Signed-off-by: Luka Perkov <luka@openwrt.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
10 years agosf: probe: Hex values are in lower case
Luka Perkov [Mon, 28 Oct 2013 09:26:41 +0000 (10:26 +0100)]
sf: probe: Hex values are in lower case

All other hex values in sf_probe.c are in lower case so we should
fix this one too.

Signed-off-by: Luka Perkov <luka@openwrt.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
10 years agoMakefile: fix broken pipe error for lcd4_lwmon5 board
Masahiro Yamada [Wed, 18 Dec 2013 10:00:51 +0000 (19:00 +0900)]
Makefile: fix broken pipe error for lcd4_lwmon5 board

Before this commit, a broken pipe error sometimes happened
when building lcd4_lwmon5 board with Buildman.

This commit re-writes build rules of
u-boot.spr and u-boot-img-spl-at-end.bin
more simply without using a pipe.

Besides fixing a broken pipe error,
this commit gives us other advantages:

  - Do not generate intermidiate files, spl/u-boot-spl.img
    and spl/u-boot-spl-pad.img for creating u-boot.spr

  - Do not generate an intermidiate file, u-boot-pad.img
    for creating u-boot-img-spl-at-end.bin

Such intermidiate files were not deleted by "make clean" or "make mrpropr".
Nor u-boot-pad.img was ignored by git.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
10 years agoMakefile: fix the typo error for mrproper
Bo Shen [Mon, 16 Dec 2013 07:27:23 +0000 (15:27 +0800)]
Makefile: fix the typo error for mrproper

Fix the typo error for mrproper from mkproper.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoserial_sh: add support for SH7753
Yoshihiro Shimoda [Wed, 18 Dec 2013 07:04:20 +0000 (16:04 +0900)]
serial_sh: add support for SH7753

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agonet: sh-eth: add support for SH7753
Yoshihiro Shimoda [Wed, 18 Dec 2013 07:04:04 +0000 (16:04 +0900)]
net: sh-eth: add support for SH7753

SH7753 has two fast ethernet controllers and two gigabit ethernet
controllers. It is similar to SH7757.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agosh: add support for sh7753evb board
Yoshihiro Shimoda [Wed, 18 Dec 2013 07:03:44 +0000 (16:03 +0900)]
sh: add support for sh7753evb board

The SH7753 EVB board has SH7753, 512MB DDR3-SDRAM, SPI ROM,
Gigabit Ethernet, and eMMC.

This patch support the following functions:
 - 512MB DDR3-SDRAM, SCIF4, SPI ROM, Gigabit Ethernet, eMMC

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agomtd: nand: omap: fix ecc ops assignment when changing ecc
Nikita Kiryanov [Tue, 17 Dec 2013 13:18:01 +0000 (15:18 +0200)]
mtd: nand: omap: fix ecc ops assignment when changing ecc

If we change to software ecc and then back to hardware ecc, the nand ecc ops
pointers are populated with incorrect function pointers. This is related to the
way nand_scan_tail() handles assigning functions to ecc ops:

If we are switching to software ecc/no ecc, it assigns default functions to the
ecc ops pointers unconditionally, but if we are switching to hardware ecc,
the default hardware ecc functions are assigned to ops pointers only if these
pointers are NULL (so that drivers could set their own functions). In the case
of omap_gpmc.c driver, when we switch to sw ecc, sw ecc functions are
assigned to ecc ops by nand_scan_tail(), and when we later switch to hw ecc,
the ecc ops pointers are not NULL, so nand_scan_tail() does not overwrite
them with hw ecc functions.
The result: sw ecc functions used to write hw ecc data.

Clear the ecc ops pointers in omap_gpmc.c when switching ecc types, so that
ops which were not assigned by the driver will get the correct default values
from nand_scan_tail().

Cc: Scott Wood <scottwood@freescale.com>
Cc: Pekon Gupta <pekon@ti.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agomtd: nand: omap: fix sw->hw->sw ecc switch
Nikita Kiryanov [Mon, 16 Dec 2013 17:19:01 +0000 (19:19 +0200)]
mtd: nand: omap: fix sw->hw->sw ecc switch

When switching ecc mode, omap_select_ecc_scheme() assigns the appropriate values
into the current nand chip's ecc.layout struct. This is done under the
assumption that the struct exists only to store values, so it is OK to overwrite
it, but there is at least one situation where this assumption is incorrect:

When switching to 1 bit hamming code sw ecc, the job of assigning layout data
is outsourced to nand_scan_tail(), which simply assigns into ecc.layout a
pointer to an existing struct prefilled with the appropriate values. This struct
doubles as both data and layout definition, and therefore shouldn't be
overwritten, but on the next switch to hardware ecc, this is exactly what's
going to happen. The next time the user switches to software ecc, they're
going to get a messed up ecc layout.

Prevent this and possible similar bugs by explicitly using the
private-to-omap_gpmc.c omap_ecclayout struct when switching ecc mode.

Cc: Scott Wood <scottwood@freescale.com>
Cc: Pekon Gupta <pekon@ti.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
10 years agonand_util.c: Use '%zd' for length in nand_unlock debug print
Tom Rini [Mon, 16 Dec 2013 14:59:34 +0000 (09:59 -0500)]
nand_util.c: Use '%zd' for length in nand_unlock debug print

length is size_t so needs to be '%zd' not '%d' to avoid warnings.

Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Tom Rini <trini@ti.com>
10 years agomtd: nand: omap: fix HAM1_SW ecc using default value for ecc.size
Nikita Kiryanov [Thu, 12 Dec 2013 13:19:31 +0000 (15:19 +0200)]
mtd: nand: omap: fix HAM1_SW ecc using default value for ecc.size

Commit "mtd: nand: omap: enable BCH ECC scheme using ELM for generic
platform" (d016dc42cedbf6102e100fa9ecb58462edfb14f8) changed the way
software ECC is configured, both during boot, and during ecc switch, in a way
that is not backwards compatible with older systems:

Older version of omap_gpmc.c always assigned ecc.size = 0 when configuring
for software ecc, relying on nand_scan_tail() to select a default for ecc.size
(256), while the new version of omap_gpmc.c assigns ecc.size = pagesize,
which is likely to not be 256.

Since 1 bit hamming sw ecc is only meant to be used by legacy devices, revert
to the original behavior.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@ti.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Pekon Gupta <pekon@ti.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Pekon Gupta <pekon@ti.com>
10 years agomtd: nand: omap_gpmc: cosmetic: Fix indentation
Stefan Roese [Thu, 5 Dec 2013 06:58:06 +0000 (07:58 +0100)]
mtd: nand: omap_gpmc: cosmetic: Fix indentation

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pekon Gupta <pekon@ti.com>
Cc: Scott Wood <scottwood@freescale.com>
[scottwood@freescale.com: wrap some long lines]
Signed-off-by: Scott Wood <scottwood@freescale.com>
10 years agomtd: nand: omap: fix ecc-layout for HAM1 ecc-scheme
pekon gupta [Thu, 5 Dec 2013 12:24:21 +0000 (17:54 +0530)]
mtd: nand: omap: fix ecc-layout for HAM1 ecc-scheme

As per OMAP3530 TRM referenced below [1]

For large-page NAND, ROM code expects following ecc-layout for HAM1 ecc-scheme
 - OOB[1] (offset of 1 *byte* from start of OOB) for x8 NAND device
 - OOB[2] (offset of 1 *word* from start of OOB) for x16 NAND device

Thus ecc-layout expected by ROM code for HAM1 ecc-scheme is:
 *for x8 NAND Device*
 +--------+---------+---------+---------+---------+---------+---------+
 | xxxx   | ECC[A0] | ECC[A1] | ECC[A2] | ECC[B0] | ECC[B1] | ECC[B2] | ...
 +--------+---------+---------+---------+---------+---------+---------+

 *for x16 NAND Device*
 +--------+--------+---------+---------+---------+---------+---------+---------+
 | xxxxx  | xxxxx  | ECC[A0] | ECC[A1] | ECC[A2] | ECC[B0] | ECC[B1] | ECC[B2] |
 +--------+--------+---------+---------+---------+---------+---------+---------+

This patch fixes ecc-layout *only* for HAM1, as required by ROM-code
For other ecc-schemes like (BCH8) ecc-layout is same for x8 or x16 devices.

[1] OMAP3530: http://www.ti.com/product/omap3530
    TRM: http://www.ti.com/litv/pdf/spruf98x
Chapter-25: Initialization Sub-topic: Memory Booting
Section: 25.4.7.4 NAND
Figure 25-19. ECC Locations in NAND Spare Areas

Reported-by: Stefan Roese <sr@denx.de>
Signed-off-by: Pekon Gupta <pekon@ti.com>
Tested-by: Stefan Roese <sr@denx.de>
10 years agoPrepare v2014.01-rc2 v2014.01-rc2
Tom Rini [Mon, 16 Dec 2013 18:07:05 +0000 (13:07 -0500)]
Prepare v2014.01-rc2

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Mon, 16 Dec 2013 14:30:52 +0000 (09:30 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-video

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Tom Rini [Mon, 16 Dec 2013 14:13:25 +0000 (09:13 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

10 years agoMakefile, .gitignore: Cleanup non-existing binaries
Masahiro Yamada [Fri, 6 Dec 2013 07:34:10 +0000 (16:34 +0900)]
Makefile, .gitignore: Cleanup non-existing binaries

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoexamples: x86: delete 82559_eeprom
Masahiro Yamada [Fri, 6 Dec 2013 07:34:09 +0000 (16:34 +0900)]
examples: x86: delete 82559_eeprom

Commit fea25720 renamed arch/i386 to arch/x86.
But it missed to modify examples/standalone/Makefile.

Since then, examples/standalone/82559_eeprom has
never compiled and nobody has noticed that.

After some discussion on ML, we agreed to delete this example.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: Select objects by CONFIG_ rather than $(ARCH) or $(CPU)
Masahiro Yamada [Thu, 28 Nov 2013 03:09:59 +0000 (12:09 +0900)]
Makefile: Select objects by CONFIG_ rather than $(ARCH) or $(CPU)

Convert like follows:

 CPU mpc83xx  -> CONFIG_MPC83xx
 CPU mpc85xx  -> CONFIG_MPC85xx
 CPU mpc86xx  -> CONFIG_MPC86xx
 CPU mpc5xxx  -> CONFIG_MPC5xxx
 CPU mpc8xx   -> CONFIG_8xx
 CPU mpc8260  -> CONFIG_8260
 CPU ppc4xx   -> CONFIG_4xx
 CPU x86      -> CONFIG_X86
 ARCH x86     -> CONFIG_X86
 ARCH powerpc -> CONFIG_PPC

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: delete unnecessary lines
Masahiro Yamada [Fri, 29 Nov 2013 00:43:57 +0000 (09:43 +0900)]
Makefile: delete unnecessary lines

REMOTE_BUILD is not used any more.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoREADME.vxworks: add a document describing the new VxWorks boot interface
Miao Yan [Thu, 28 Nov 2013 09:51:40 +0000 (17:51 +0800)]
README.vxworks: add a document describing the new VxWorks boot interface

Signed-off-by: Miao Yan <miao.yan@windriver.com>
10 years agocommon/fdt_support.c: avoid unintended return from fdt_fixup_memory_banks()
Miao Yan [Thu, 28 Nov 2013 09:51:39 +0000 (17:51 +0800)]
common/fdt_support.c: avoid unintended return from fdt_fixup_memory_banks()

fdt_fixup_memory_banks() will add and update /memory node in
device tree blob. In the case that /memory node doesn't exist,
after adding a new one, this function returns error.

The correct behavior should be continuing to update its properties.

Signed-off-by: Miao Yan <miao.yan@windriver.com>
10 years agocommon/cmd_bootm: extend do_bootm_vxworks to support the new VxWorks boot interface.
Miao Yan [Thu, 28 Nov 2013 09:51:38 +0000 (17:51 +0800)]
common/cmd_bootm: extend do_bootm_vxworks to support the new VxWorks boot interface.

The next version VxWorks adopts device tree (for PowerPC and ARM) as its hardware
description mechanism. For PowerPC, the boot interface conforms to
the ePAPR standard, which is:

   void (*kernel_entry)(ulong fdt_addr,
          ulong r4 /* 0 */,
          ulong r5 /* 0 */,
          ulong r6 /* EPAPR_MAGIC */, ulong r7 /* IMA size */,
          ulong r8 /* 0 */, ulong r9 /* 0 */)

For ARM, the boot interface is:

   void (*kernel_entry)(void *fdt_addr)

Signed-off-by: Miao Yan <miao.yan@windriver.com>
[trini: Fix build error when !CONFIG_OF_FDT is set, typo on PowerPC,
missing extern ft_fixup_num_cores]
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoblackfin: remove build warning
Sonic Zhang [Mon, 9 Dec 2013 06:55:21 +0000 (14:55 +0800)]
blackfin: remove build warning

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoblackfin: fixing warning by including proper headers
Sonic Zhang [Mon, 9 Dec 2013 04:56:27 +0000 (12:56 +0800)]
blackfin: fixing warning by including proper headers

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoblackfin: fix building error by enlarging the memory size
Sonic Zhang [Mon, 9 Dec 2013 04:45:29 +0000 (12:45 +0800)]
blackfin: fix building error by enlarging the memory size

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoblackfin: Disable commands to reduce l1 ram requirement
Sonic Zhang [Mon, 9 Dec 2013 04:38:56 +0000 (12:38 +0800)]
blackfin: Disable commands to reduce l1 ram requirement

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoblackfin: fix building error by adding macro CONFIG_SYS_I2C
Sonic Zhang [Mon, 9 Dec 2013 04:21:07 +0000 (12:21 +0800)]
blackfin: fix building error by adding macro CONFIG_SYS_I2C

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agoblackfin: fix build error by adding CONFIG_BFIN_SERIAL
Sonic Zhang [Mon, 9 Dec 2013 04:19:38 +0000 (12:19 +0800)]
blackfin: fix build error by adding CONFIG_BFIN_SERIAL

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
10 years agocommon/config_defaults.h: make CONFIG_BOOTM_VXWORKS default configuration
Miao Yan [Thu, 28 Nov 2013 09:51:37 +0000 (17:51 +0800)]
common/config_defaults.h: make CONFIG_BOOTM_VXWORKS default configuration

Signed-off-by: Miao Yan <miao.yan@windriver.com>
10 years agocommon/cmd_bootm.c: seperate do_bootm_vxworks related code from CONFIG_CMD_ELF.
Miao Yan [Thu, 28 Nov 2013 09:51:36 +0000 (17:51 +0800)]
common/cmd_bootm.c: seperate do_bootm_vxworks related code from CONFIG_CMD_ELF.

do_bootm_vxworks now is available under the configuration option
CONFIG_BOOTM_VXWORKS, thus aligned with other operating systems
that supported by bootm command. The bootvx command still depneds
on CONFIG_CMD_ELF.

Signed-off-by: Miao Yan <miao.yan@windriver.com>
10 years agoMakefile: delete unnecessary CPPFLAGS settings
Masahiro Yamada [Thu, 28 Nov 2013 09:31:59 +0000 (18:31 +0900)]
Makefile: delete unnecessary CPPFLAGS settings

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: Move some scripts imported from Linux
Masahiro Yamada [Thu, 28 Nov 2013 07:29:23 +0000 (16:29 +0900)]
Makefile: Move some scripts imported from Linux

We have some scripts imported from Linux Kernel:
setlocalversion, checkstack.pl, checkpatch.pl, cleanpatch

They are located under tools/ directory in U-Boot now.
But they were originally located under scripts/ directory
in Linux Kernel.

This commit moves them to the original location.

It is true that binutils-version.sh and dtc-version.sh
do not originate in Linux Kernel, but they should
be moved by analogy to gcc-version.sh.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agodrivers/mtd: descend into sub directories only when it is necessary
Masahiro Yamada [Thu, 28 Nov 2013 03:22:17 +0000 (12:22 +0900)]
drivers/mtd: descend into sub directories only when it is necessary

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agodrivers/usb/gadget: select objects by obj-$(CONFIG-...)
Masahiro Yamada [Thu, 28 Nov 2013 03:20:14 +0000 (12:20 +0900)]
drivers/usb/gadget: select objects by obj-$(CONFIG-...)

Before switching to the real Kbuild, drivers/usb/gadget/Makefile
must be fixed.
If none of CONFIG_USB_GADGET, CONFIG_USB_ETHER, CONFIG_USB_DEVICE
is defined, both obj- and obj-y get empty.

We need non-empty obj- or obj-y on each Makefile
to generate built-in.o on the real Kbuild.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopost: descend only when CONFIG_HAS_POST is defined
Masahiro Yamada [Thu, 28 Nov 2013 03:09:58 +0000 (12:09 +0900)]
post: descend only when CONFIG_HAS_POST is defined

All objects under post/ directory are enabled by CONFIG_HAS_POST.
(post/tests.o is enabled by CONFIG_POST_STD_LIST.
But CONFIG_POST_STD_LIST depends on CONFIG_HAS_POST.)

We can move CONFIG_HAS_POST switch to the top Makefile.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: delete a make rule of $(LDSCRIPT)
Masahiro Yamada [Thu, 28 Nov 2013 02:06:03 +0000 (11:06 +0900)]
Makefile: delete a make rule of $(LDSCRIPT)

$(LDSCRIPT) is a source file, not a generated file.
We do not need a make rule of $(LDSCRIPT).

And one more trivial fix:
$(obj)/u-boot should not dierectly depend on $(LDSCRIPTS).

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoboard_f: explicitly disable console on early boot
Alexey Brodkin [Wed, 27 Nov 2013 18:32:40 +0000 (22:32 +0400)]
board_f: explicitly disable console on early boot

If U-Boot build with DEBUG enabled/defined the first call of "debug"
function (that dumps data to any available console) will happen before
zeroing of initial "gd" in init call "zero_global_data" in
"init_sequence_f".

And if stack was not filled with zeros chances are high that
"gd->have_console" won't be 0. In its turn it will cause attempt to
output things to non-initialized yet serial console.

So for safety and predictability we set "gd->have_console = 0".

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agoCorrect vxWorks elf boot to load at correct address
Stany MARCEL [Wed, 27 Nov 2013 13:48:43 +0000 (14:48 +0100)]
Correct vxWorks elf boot to load at correct address

argv[0] contains bootvx (command name) not the load address, if called with
argv < 2 use load_addr, else use address argument given to the command.

Signed-off-by: Stany MARCEL <smarcel@novasys-ingenierie.com>
10 years ago.gitignore: ignore spl/ and tpl/ directories except spl/Makefile
Masahiro Yamada [Tue, 26 Nov 2013 09:05:45 +0000 (18:05 +0900)]
.gitignore: ignore spl/ and tpl/ directories except spl/Makefile

Before this commit, output files under tpl/ directry
were not ignored.
This commit fixes this problem.

And we have only one source file under spl/ directory:
 spl/Makefile

So, we can describe .gitignore more simply.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoPowerPC: merge commonly-defined flags
Masahiro Yamada [Tue, 26 Nov 2013 01:53:58 +0000 (10:53 +0900)]
PowerPC: merge commonly-defined flags

PLATFORM_RELFLAGS += -meabi
PLATFORM_CPPFLAGS += -ffixed-r2
were defined in all arch/powerpc/${CPU}/config.mk.

This commit moves them to arch/powerpc/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agonetbsd:fix documentation typo.
Kees Jongenburger [Thu, 12 Dec 2013 15:18:35 +0000 (16:18 +0100)]
netbsd:fix documentation typo.

The documentation suggested the arguments where passed over r3-r6
while the code below simply does that over r0-r3.

Cc: Kumar Gala <galak@kernel.crashing.org>
10 years agospl/Makefile: merge LIBS-y += arch/$(ARCH)/imx-common
Masahiro Yamada [Wed, 11 Dec 2013 01:00:08 +0000 (10:00 +0900)]
spl/Makefile: merge LIBS-y += arch/$(ARCH)/imx-common

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoyaffs2: Use lldiv for 64bit division
Tom Rini [Thu, 5 Dec 2013 19:48:39 +0000 (14:48 -0500)]
yaffs2: Use lldiv for 64bit division

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoJFFS2: Correct jffs2_1pass_build_lists to use lldiv
Tom Rini [Thu, 5 Dec 2013 19:48:38 +0000 (14:48 -0500)]
JFFS2: Correct jffs2_1pass_build_lists to use lldiv

Since part_info size became 64bit we need to use lldiv here.

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoARM:PXA: Correct tick_to_time / us_to_tick to use lldiv
Tom Rini [Thu, 5 Dec 2013 19:48:37 +0000 (14:48 -0500)]
ARM:PXA: Correct tick_to_time / us_to_tick to use lldiv

Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
10 years agoARM:zynq: Correct __udelay to use lldiv
Tom Rini [Thu, 5 Dec 2013 19:48:36 +0000 (14:48 -0500)]
ARM:zynq: Correct __udelay to use lldiv

Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Tom Rini <trini@ti.com>
10 years agotime: fix usec_to_tick()
Stephen Warren [Thu, 5 Dec 2013 19:08:09 +0000 (12:08 -0700)]
time: fix usec_to_tick()

Commit 8dfafdde88eb ("Introduce common timer functions") created a
common definition of usec_to_tick() which had a couple problems:

static unsigned long long usec_to_tick(unsigned long usec)
{
       uint64_t tick = usec * get_tbclk();

That likely overflows.

       usec *= get_tbclk();

That was an attempt to fix it by performing the multiply after the
promotion of usec to 64-bit, but was applied to the wrong variable,
which was never used.

This patch fixes these issues. A user-visible symptom of the problem was
the e.g. "dhcp zImage" using an ASIX USB Ethernet dongle would print:

Waiting for Ethernet connection... unable to connect.

... with no delay before "unable to connect". There are likely other
symptoms.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
10 years agoMakefile: correct dependencies of asm-offsets.[hs]
Masahiro Yamada [Thu, 5 Dec 2013 06:30:18 +0000 (15:30 +0900)]
Makefile: correct dependencies of asm-offsets.[hs]

These four generated files depends on neither {spl,tpl}-autoconf.mk
nor autoconf.mk.dep.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: use two double-quotations as a pair
Masahiro Yamada [Thu, 5 Dec 2013 06:08:31 +0000 (15:08 +0900)]
Makefile: use two double-quotations as a pair

Some editors such as Emacs can highlight source files.
But their parser algorithm is not perfect.

If you use one double-quotation alone, some editor cannot
handle it nicely and mark source lines as a string by mistake.

It is preferable to use two double-quotations as a pair.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoMakefile: Do not create empty autoconf.mk on error
Masahiro Yamada [Mon, 2 Dec 2013 05:57:29 +0000 (14:57 +0900)]
Makefile: Do not create empty autoconf.mk on error

The build rules of
  - include/autoconf.mk.dep
  - include/autoconf.mk
  - include/spl-autoconf.mk
  - include/tpl-autoconf.mk
were not nice.

They created empty files (which are never updated)
if an error occurs during preprocessing.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agosandbox: dumpimage: Test dumpimage
Guilherme Maciel Ferreira [Sun, 1 Dec 2013 19:43:12 +0000 (12:43 -0700)]
sandbox: dumpimage: Test dumpimage

Add a test for dumpimage.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoAdd dumpimage, a tool to extract data from U-Boot images
Guilherme Maciel Ferreira [Sun, 1 Dec 2013 19:43:11 +0000 (12:43 -0700)]
Add dumpimage, a tool to extract data from U-Boot images

Given a multi-file image created through the mkimage's -d option:

  $ mkimage -A x86 -O linux -T multi -n x86 -d vmlinuz:initrd.img:System.map \
  multi.img

  Image Name:   x86
  Created:      Thu Jul 25 10:29:13 2013
  Image Type:   Intel x86 Linux Multi-File Image (gzip compressed)
  Data Size:    13722956 Bytes = 13401.32 kB = 13.09 MB
  Load Address: 00000000
  Entry Point:  00000000
  Contents:
     Image 0: 4040128 Bytes = 3945.44 kB = 3.85 MB
     Image 1: 7991719 Bytes = 7804.41 kB = 7.62 MB
     Image 2: 1691092 Bytes = 1651.46 kB = 1.61 MB

It is possible to perform the innverse operation -- extracting any file from
the image -- by using the dumpimage's -i option:

  $ dumpimage -i multi.img -p 2 System.map

Although it's feasible to retrieve "data files" from image through scripting,
the requirement to embed tools such 'dd', 'awk' and 'sed' for this sole purpose
is cumbersome and unreliable -- once you must keep track of file sizes inside
the image. Furthermore, extracting data files using "dumpimage" tool is faster
than through scripting.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agotools: moved code common to all image tools to a separated module.
Guilherme Maciel Ferreira [Sun, 1 Dec 2013 19:43:10 +0000 (12:43 -0700)]
tools: moved code common to all image tools to a separated module.

In order to avoid duplicating code and keep only one point of modification,
the functions, structs and defines useful for "dumpimage" were moved from
"mkimage" to a common module called "imagetool".

This modification also weakens the coupling between image types (FIT, IMX, MXS,
and so on) and image tools (mkimage and dumpimage). Any tool may initialize the
"imagetool" through register_image_tool() function, while the image types
register themselves within an image tool using the register_image_type()
function:

                                                      +---------------+
                                               +------|   fit_image   |
 +--------------+          +-----------+       |      +---------------+
 |    mkimage   |--------> |           | <-----+
 +--------------+          |           |              +---------------+
                           | imagetool | <------------|    imximage   |
 +--------------+          |           |              +---------------+
 |  dumpimage   |--------> |           | <-----+
 +--------------+          +-----------+       |      +---------------+
                                               +------| default_image |
                                                      +---------------+

          register_image_tool()           register_image_type()

Also, the struct "mkimage_params" was renamed to "image_tool_params" to make
clear its general purpose.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agomkimage: added 'static' specifier to match function's prototype.
Guilherme Maciel Ferreira [Sun, 1 Dec 2013 19:43:09 +0000 (12:43 -0700)]
mkimage: added 'static' specifier to match function's prototype.

This function should be declared static.

Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agokgdb: configs: remove obsolete CONFIG_KGDB_SER_INDEX
Vladimir Zapolskiy [Sun, 1 Dec 2013 18:07:28 +0000 (20:07 +0200)]
kgdb: configs: remove obsolete CONFIG_KGDB_SER_INDEX

The last users of CONFIG_KGDB_SER_INDEX were removed more than 3 years
ago in commits 550650ddd0 and bf16500f79, either kgdb subsystem should
care about this parameter or it should be gone completely.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
10 years agoserial: lpc32xx: send CR before LF
Vladimir Zapolskiy [Sat, 30 Nov 2013 14:47:01 +0000 (16:47 +0200)]
serial: lpc32xx: send CR before LF

For LPC32XX high-speed UART it is required to send a carriage return
symbol along with line feed. The problem was introduced in e503f90a
commit.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
10 years agopowerpc/mpc85xx: Update CONFIG_SYS_FSL_TBCLK_DIV for T1040
Prabhakar Kushwaha [Wed, 11 Dec 2013 07:19:13 +0000 (12:49 +0530)]
powerpc/mpc85xx: Update CONFIG_SYS_FSL_TBCLK_DIV for T1040

The default value of CONFIG_SYS_FSL_TBCLK_DIV is 16.

So, update its value as default.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/p1_p2_rdb_pc: Fix warnings for __iomem pointers
Claudiu Manoil [Tue, 10 Dec 2013 09:22:22 +0000 (11:22 +0200)]
powerpc/p1_p2_rdb_pc: Fix warnings for __iomem pointers

Add the __iomem address space marker for the tsec pointers
to struct tsec_mii_mng memory mapped register regions.
This solves the sparse warnings for mixig normal pointers with
__iomem pointers for tsec.

p1_p2_rdb_pc.c:373:24: warning: incorrect type in assignment (different
address spaces)
p1_p2_rdb_pc.c:373:24:    expected struct tsec_mii_mng [noderef]
<asn:2>*regs
p1_p2_rdb_pc.c:373:24:    got struct tsec_mii_mng *<noident>

Use TSEC_GET_MDIO_REGS_BASE() for the remaining mdio 'regs'
initializations to remove the __iomem warnings and for consistency.

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
10 years agonet/fman: add ft_fixup_xgec to support 3rd and 4th 10GEC
Shengzhou Liu [Mon, 2 Dec 2013 02:23:11 +0000 (10:23 +0800)]
net/fman: add ft_fixup_xgec to support 3rd and 4th 10GEC

As mEMAC1 and mEMAC2 are dual-role MACs, which are used as 1G or 10G MAC.
So we update dynamically 'cell-index' to '2' and '3' for 10GEC3 and 10GEC4.
Also change 'fsl,fman-port-1g-rx' to 'fsl,fman-port-10g-rx', ditto for Tx.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t4240: Add a frequency setting case for fman1
Shaohui Xie [Thu, 28 Nov 2013 05:52:51 +0000 (13:52 +0800)]
powerpc/t4240: Add a frequency setting case for fman1

A new valid setting case added for fman1, it uses platform frequency.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 10 Dec 2013 22:15:18 +0000 (17:15 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoMerge branch 'u-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 10 Dec 2013 13:31:56 +0000 (14:31 +0100)]
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
arch/arm/cpu/armv7/rmobile/Makefile
doc/README.scrapyard

Needed manual fix:
arch/arm/cpu/armv7/omap-common/Makefile
board/compulab/cm_t335/u-boot.lds

10 years agoMerge branch 'spi' of git://git.denx.de/u-boot-x86
Tom Rini [Tue, 10 Dec 2013 14:36:23 +0000 (09:36 -0500)]
Merge branch 'spi' of git://git.denx.de/u-boot-x86

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Tom Rini [Tue, 10 Dec 2013 14:33:13 +0000 (09:33 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Tom Rini [Tue, 10 Dec 2013 14:29:45 +0000 (09:29 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c