]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
11 years agodfu: Make maximum DFU file size equal to default DFU data buffer
Lukasz Majewski [Tue, 10 Sep 2013 13:29:23 +0000 (15:29 +0200)]
dfu: Make maximum DFU file size equal to default DFU data buffer

Up till now the DFU maximum file size (to be written to e.g. eMMC)
was different from the DFU data buffer size. It caused errors when
one buffer was smaller than data to be written.

Now, the maximum DFU file size is equal to default DFU buffer size.
In spite of this, user is still able to manually adjust those default
values.

Change-Id: Ied75d0f7b59588ebd79dae9a22af801d36622216
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agodfu:cosmetic: Fix printf text for buffer overflow condition
Lukasz Majewski [Tue, 10 Sep 2013 13:29:22 +0000 (15:29 +0200)]
dfu:cosmetic: Fix printf text for buffer overflow condition

Correct error message if overflow is detected.

Change-Id: I8a915c7353d49822c046fbc36241237b370e6c98
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agousb: gadget: Fix data aborts during USB ethernet boot
Joel Fernandes [Wed, 4 Sep 2013 23:55:14 +0000 (18:55 -0500)]
usb: gadget: Fix data aborts during USB ethernet boot

As seen on GCC 4.6 Linaro compiler, control_req buffer is not aligned
on 4 byte boundaray causing data aborts in eth_setup -> conf_buf
during dhcp boot over usb_ether. Fix the issue my aligning control_req
buffer using DEFINE_CACHE_ALIGN_BUFFER.

Tested on am335x_evm platform (beaglebone).
Applies on 2013.10-rc1 branch.

Cc: Tom Rini <trini@ti.com>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Joel Fernandes <joelf@ti.com>
11 years agoSound: MAX98095: Support I2S0 channel
Dani Krishna Mohan [Wed, 11 Sep 2013 11:08:50 +0000 (16:38 +0530)]
Sound: MAX98095: Support I2S0 channel

This patch modifies the MAX98095 audio codec to support
 I2S0 channel in codec slave mode.

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
11 years agoSound: I2S: Replacing I2S1 with I2S0 channel.
Dani Krishna Mohan [Wed, 11 Sep 2013 11:08:49 +0000 (16:38 +0530)]
Sound: I2S: Replacing I2S1 with I2S0 channel.

This patch makes required changes to make use
of I2S0 channel instead of I2S1 channel on exynos5250.

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
11 years agoARM: Added I2S0 clocks for audio
Dani Krishna Mohan [Wed, 11 Sep 2013 11:08:48 +0000 (16:38 +0530)]
ARM: Added I2S0 clocks for audio

This patch makes the necessary changes for making use of
I2S0 channel instead of I2S1 channel on smdk board. This
changes are done to maintain the uniformity to use I2S0 channel.

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
11 years agoDTS: Addition of I2S0 channel and replacing I2S1
Dani Krishna Mohan [Wed, 11 Sep 2013 11:08:47 +0000 (16:38 +0530)]
DTS: Addition of I2S0 channel and replacing I2S1

This patch enables default I2S0 channel.And I2S platform
parameter has been moved to a common file viz exynos5.dtsi.

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
11 years agoSound: WM8994: Support I2S0 channel
Dani Krishna Mohan [Wed, 11 Sep 2013 11:08:46 +0000 (16:38 +0530)]
Sound: WM8994: Support I2S0 channel

This patch modifies the WM8994 codec to support I2S0 channel
in codec slave mode

Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
11 years agocmd_pxe.c: Pass along 'cmdtp' to do_bootm()/do_bootz()
Tom Rini [Tue, 24 Sep 2013 13:05:08 +0000 (09:05 -0400)]
cmd_pxe.c: Pass along 'cmdtp' to do_bootm()/do_bootz()

When we call do_bootm() with a vmlinuz, this would lead to a NULL
pointer dereference, and after talking with Wolfgang the right thing to
do here for now is to make sure that we pass cmdtp to these functions
rather than NULL.

Reported-by: Steven A. Falco <stevenfalco@gmail.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agocmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS
Tom Rini [Mon, 23 Sep 2013 18:20:37 +0000 (14:20 -0400)]
cmd_bootm.c: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS

In 5c427e4 we pass BOOTM_STATE_OS_CMDLINE as part of the bootm states to
run, on all arches.  However, this is only valid / useful on PowerPC and
MIPS, and causes a problem on ARM where we specifically do not use it.
Rather than make this state fake pass like we do for GO on some arches
(which need updating to use the GO state), we should just not pass
CMDLINE except when it may be used, like before.

Tested-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mmc
Tom Rini [Fri, 20 Sep 2013 18:06:10 +0000 (14:06 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mmc

11 years agoFix wrong sdhci host control register read and write
Juhyun \(Justin\) Oh [Fri, 13 Sep 2013 18:06:00 +0000 (18:06 +0000)]
Fix wrong sdhci host control register read and write

The patch fixes the improper read and write of sdhci
host control register for sdma transfer.

The problem comes when reading and writing 1 byte long
host control register with the sdhci_readl() and
sdhci_writel(). The misuse of these functions overwrite
the value of the next registers which are in 4 bytes boundary.

This patch replaces four byte register read/write functions
with one byte read/write ones. Beside, it eliminates
unnecessary bit operation. i.e. or-ing zero against a variable.

Signed-off-by: Juhyun (Justin) Oh <Juhyun_Oh@sigmadesigns.com>
11 years agoAdd parentheses to ALLOC_ALIGN_BUFFER macro's
Mischa Jonker [Fri, 26 Jul 2013 14:18:41 +0000 (16:18 +0200)]
Add parentheses to ALLOC_ALIGN_BUFFER macro's

Without those it's very easy to make mistakes when for instance
the 'size' field is more than just a constant.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Anton Staaf <robotboy@chromium.org>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
11 years agommc/dw_mmc: Allocate the correct amount of descriptors
Mischa Jonker [Fri, 26 Jul 2013 14:18:40 +0000 (16:18 +0200)]
mmc/dw_mmc: Allocate the correct amount of descriptors

This fixes two issues:
 * a descriptor was allocated for every block, while a descriptor can
   take 8 blocks
 * there was an off-by-one error in the descriptor preparation: there
   were two last descriptors, one with length==0

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Andy Fleming <afleming@gmail.com>
11 years agommc/dw_mmc: Fix DMA descriptor corruption
Mischa Jonker [Fri, 26 Jul 2013 12:08:14 +0000 (14:08 +0200)]
mmc/dw_mmc: Fix DMA descriptor corruption

In dwmci_prepare_data, the descriptors are allocated for DMA transfer.
These are allocated using the ALLOC_CACHE_ALIGN_BUFFER. This macro uses
the stack to allocate these descriptors. This becomes a problem if the
DMA transfer continues after the processor leaves the function in which
the descriptors were allocated.

Therefore, I have moved the allocated of the buffers up one level, to
dwmci_send_cmd(). The DMA transfer should be complete when leaving this
function.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Andy Fleming <afleming@gmail.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: don't support write & erase for SPL builds
Paul Burton [Mon, 9 Sep 2013 14:30:26 +0000 (15:30 +0100)]
mmc: don't support write & erase for SPL builds

For SPL builds this is just dead code since we'll only need to read.
Eliminating it results in a significant size reduction for the SPL
binary, which may be critical for certain platforms where the binary
size is highly constrained.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agobuildman: fix boards.cfg parsing
Andreas Bießmann [Thu, 19 Sep 2013 08:08:45 +0000 (10:08 +0200)]
buildman: fix boards.cfg parsing

Commit 27af930e9a5c91365ca639ada580b338eabe4989 changed the boards.cfg format
but missed to change the parsing in buildman.

This patch changes c'tor of Board class to the new sequence, but omits
maintainer field.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoFIT: delete unnecessary casts
Masahiro Yamada [Thu, 19 Sep 2013 03:10:18 +0000 (12:10 +0900)]
FIT: delete unnecessary casts

Becuase fdt_check_header function takes (const void *)
type argument, the argument should be passed to it
without being casted to (char *).

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoMakefile: Do not show make debug messages
Masahiro Yamada [Wed, 18 Sep 2013 03:01:27 +0000 (12:01 +0900)]
Makefile: Do not show make debug messages

In commit 27af930, the top Makefile was adjusted to the new
boards.cfg format.

But at the same time, -d option was added.

If you configure and make separately, for example
like follows:

    make omap4_panda_config
    make CROSS_COMPILE=<your_compiler_prefix>

it works fine as it did before.

But if you do them in one time like follows:

    make omap4_panda CROSS_COMPILE=<your_compiler_prefix>

The log is sprinkled with annoying make debug messages.

This commit deletes -d option again.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Nishanth Menon <nm@ti.com>
11 years agocosmetic: FIT: fix typos in comments
Masahiro Yamada [Wed, 18 Sep 2013 00:36:38 +0000 (09:36 +0900)]
cosmetic: FIT: fix typos in comments

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoSPDX: fix IBM-pibs license identifier
Wolfgang Denk [Tue, 17 Sep 2013 09:24:06 +0000 (11:24 +0200)]
SPDX: fix IBM-pibs license identifier

The SPDX License List version 1.19 now contains an official entry for
the IBM-pibs license.  However, instead of our suggestion "ibm-pibs",
the SPDX License List uses "IBM-pibs", with the following rationale:
"The reason being that all other SPDX License List short identifiers
tend towards using capital letters unless spelling a word.  I'd prefer
to be consistent to this end".

Change the license IDs to use the official name.

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoarm: omap5: echi: Add GPL-2.0+ SPDX-License-Identifier
Nobuhiro Iwamatsu [Tue, 17 Sep 2013 07:50:36 +0000 (16:50 +0900)]
arm: omap5: echi: Add GPL-2.0+ SPDX-License-Identifier

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agoCosmetic: Fix a number of typos, no functional changes.
Robert P. J. Day [Mon, 16 Sep 2013 11:15:45 +0000 (07:15 -0400)]
Cosmetic: Fix a number of typos, no functional changes.

Fix various misspellings of things like "environment", "kernel",
"default" and "volatile", and throw in a couple grammar fixes.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
11 years agogit-mailrc: Update SPI custodian
Jagannadha Sutradharudu Teki [Mon, 16 Sep 2013 07:21:13 +0000 (12:51 +0530)]
git-mailrc: Update SPI custodian

Update git-mailrc with alias and nick name details.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agoCosmetic: Update some info in the README "arch" section.
Robert P. J. Day [Sun, 15 Sep 2013 22:34:15 +0000 (18:34 -0400)]
Cosmetic: Update some info in the README "arch" section.

Tidy up, reorder, and add newer info to the arch/ directory subsection
of the README file.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
11 years agocosmetic: doc: uImage.FIT: fix typos
Masahiro Yamada [Fri, 13 Sep 2013 11:28:21 +0000 (20:28 +0900)]
cosmetic: doc: uImage.FIT: fix typos

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoboards.cfg: show info about boards.cfg instead of MAINTAINERS
Roger Meier [Fri, 13 Sep 2013 08:51:41 +0000 (10:51 +0200)]
boards.cfg: show info about boards.cfg instead of MAINTAINERS

Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
11 years agoboards.cfg: Fix the comment for invoking tools/reformat.py from vim
Axel Lin [Fri, 13 Sep 2013 03:43:37 +0000 (11:43 +0800)]
boards.cfg: Fix the comment for invoking tools/reformat.py from vim

Add the missing bang (!) to execute external command, otherwise it does not
work.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
11 years agopart_efi: make sure the gpt_pte is freed
Mark Langsdorf [Tue, 10 Sep 2013 20:14:56 +0000 (15:14 -0500)]
part_efi: make sure the gpt_pte is freed

the gpt_pte wasn't being freed if it was checked against an invalid
partition. The resulting memory leakage could make it impossible
to repeatedly attempt to load non-existent files in a script.

Also, downgrade the message for not finding an invalid partition
from a printf() to a debug() so as to minimize message spam in
perfectly normal situations.

Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
11 years agoFix loading freeze when netconsole is active
Frederic Leroy [Tue, 10 Sep 2013 10:02:31 +0000 (12:02 +0200)]
Fix loading freeze when netconsole is active

Netconsole calls eth_halt() before giving control to another operating
system.
But the state machine of netconsole don't take it into account.
Thus, netconsole calls network functions of an halted network device,
making the whole system freeze.
Rather than modifying the state machine of netconsole, we just unregister
the current network device before booting. It does work because
nc_send_packet() verifies that the current network device is not null.

Signed-off-by: Frédéric Leroy <fredo@starox.org>
11 years agoFix some obvious typos across multiple subsystems.
Robert P. J. Day [Wed, 21 Aug 2013 15:39:19 +0000 (11:39 -0400)]
Fix some obvious typos across multiple subsystems.

Typoes fixed:

  "partion" -> "partition"
  "retrive", "retreive" -> "retrieve"
  "th" -> "to"

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
11 years agobootm: use BOOTM_STATE_OS_CMDLINE flag for plain bootm
Paul Burton [Fri, 6 Sep 2013 10:23:55 +0000 (11:23 +0100)]
bootm: use BOOTM_STATE_OS_CMDLINE flag for plain bootm

A plain bootm used to call the architecture specific boot function with
no flags, but was modified by commit 35fc84fa "Refactor the bootm
command to reduce code duplication" to call the architecture specific
boot function multiple times with various flags in sequence. The
BOOTM_STATE_OS_CMDLINE flag was not used, indeed it seems that at least
ARM prepares the command line on BOOTM_STATE_OS_PREP. However on MIPS
since commit 59e8cbdb "MIPS: bootm: refactor initialisation of kernel
cmdline" the command line is not prepared in response to a
BOOTM_STATE_OS_PREP flag, only on BOOTM_STATE_OS_CMDLINE or a call with
no flags. The end result is that a combination of those 2 commits leads
to MIPS boards booting kernels with no command line arguments.

An extra invocation of the architecture specific boot function with
BOOTM_STATE_OS_CMDLINE fixes this.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agommc: size optimization when !CONFIG_MMC_SPI
Paul Burton [Wed, 4 Sep 2013 15:12:26 +0000 (16:12 +0100)]
mmc: size optimization when !CONFIG_MMC_SPI

When CONFIG_MMC_SPI is not enabled, the MMC_MODE_SPI capability can
never be set. However there is code in mmc.c which uses the
mmc_host_is_spi macro to check that capability & act accordingly. If we
expand that macro to 0 when CONFIG_MMC_SPI is not set (since it will
always be 0 at runtime anyway) then the compiler can optimize away the
SPI-specific code paths in mmc.c.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agommc: don't call *printf or puts when SPL & !CONFIG_SPL_LIBCOMMON_SUPPORT
Paul Burton [Wed, 4 Sep 2013 15:12:25 +0000 (16:12 +0100)]
mmc: don't call *printf or puts when SPL & !CONFIG_SPL_LIBCOMMON_SUPPORT

If we don't have CONFIG_SPL_LIBCOMMON_SUPPORT defined then stdio
& *printf functions are unavailable & calling them will cause a link
failure.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agospl_mmc: only call printf or puts with CONFIG_SPL_LIBCOMMON_SUPPORT
Paul Burton [Wed, 4 Sep 2013 15:12:24 +0000 (16:12 +0100)]
spl_mmc: only call printf or puts with CONFIG_SPL_LIBCOMMON_SUPPORT

If we don't have CONFIG_SPL_LIBCOMMON_SUPPORT defined then stdio
functions are unavailable & calling them will cause a link failure.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agospl: remove unnecessary (& ARM specific) include of asm/utils.h
Paul Burton [Wed, 4 Sep 2013 15:12:23 +0000 (16:12 +0100)]
spl: remove unnecessary (& ARM specific) include of asm/utils.h

ARM is the only architecture which includes this header and nothing in
spl_mmc.c makes use of it. Remove the include.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
11 years agoARM: OMAP: Enable 8-bit eMMC access for OMAP4/5/DRA7xx
Lubomir Popov [Wed, 14 Aug 2013 15:59:18 +0000 (18:59 +0300)]
ARM: OMAP: Enable 8-bit eMMC access for OMAP4/5/DRA7xx

Enable 8-bit host capability for HSMMC2 and/or HSMMC3. CONFIG_HSMMC2_8BIT
(for OMAP4/5/DRA7xx) and/or CONFIG_HSMMC3_8BIT (for DRA7xx only) must be
defined in the board header if an 8-bit eMMC device is connected to the
corresponding port.

Fix the "No status update" error that appeared for eMMC devices by
inserting a 20 us delay between writing arguments and command. This
solution has been proposed by Michael Cashwell <mboards@prograde.net>.

A minor cosmetic fix in a comment as well.

Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
11 years agoomap_hsmmc: omap4+/am335x: modify MMC controller internal fsm reset func
Oleksandr Tyshchenko [Tue, 6 Aug 2013 10:44:16 +0000 (13:44 +0300)]
omap_hsmmc: omap4+/am335x: modify MMC controller internal fsm reset func

"mmc_send_cmd: timeout: No status update" error sometimes happens in
omap_hsmmc driver func mmc_send_cmd() when the MMC controller card
identification and selection sequence is executed for eMMC on OMAP4
boards.

It happens due to incorrect execution of CMD line reset procedure
for OMAP4. Because CMD(DAT) lines reset procedures are slightly
different for OMAP3 and OMAP4(AM335x,OMAP5,DRA7xx).

According to OMAP3 TRM:
Set SRC(SRD) bit in MMCHS_SYSCTL register to 0x1 and wait until
it returns to 0x0.

According to OMAP4(AM335x,OMAP5,DRA7xx) TRMs, CMD(DATA) lines reset
procedure steps must be as follows:
1. Initiate CMD(DAT) line reset by writing 0x1 to SRC(SRD) bit in
   MMCHS_SYSCTL register (SD_SYSCTL for AM335x).
2. Poll the SRC(SRD) bit until it is set to 0x1.
3. Wait until the SRC(SRD) bit returns to 0x0
  (reset procedure is completed).

Unfortunately, at present omap_hsmmc driver has support only for
OMAP3. And as result step #2 is missing for OMAP4(AM335x,OMAP5,DRA7xx).
This sometimes leads to the fact that the waiting loop which is
required in step #3 does not executed, because SRC bit does not set
yet (at the moment of checking a condition of a loop execution).
And as a result this can cause to timeout error when sending a
next command.

In the particular case (working with eMMC witch do not respond to
some SD specific command) due to incorrect reset sequence after
command SD_CMD_SEND_IF_COND which finished with CTO flag within
64 clock cycles, the next command MMC_CMD_APP_CMD leads to a
timeout error within 1s.

So, extend CMD(DATA) lines reset procedure in func
mmc_reset_controller_fsm() by adding the missing step #2 for
OMAP4+/AM335x boards.

Signed-off-by: Oleksandr Tyshchenko <oleksandr.tyshchenko@ti.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: Remove unused variable backup from mmc_send_cmd()
Oleksandr Tyshchenko [Tue, 6 Aug 2013 10:50:10 +0000 (13:50 +0300)]
mmc: Remove unused variable backup from mmc_send_cmd()

Do not call a memset for unused variable backup every time.
Remove unused variable from function.

Signed-off-by: Oleksandr Tyshchenko <oleksandr.tyshchenko@ti.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC
Jaehoon Chung [Fri, 19 Jul 2013 08:44:49 +0000 (17:44 +0900)]
mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC

Samsung SoC is supported the WIDE8, even if Controller version is v2.0.
So add the SDHCI_QUIRK_USE_WIDE8 for Samsung-SoC.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoPrepare v2013.10-rc3
Tom Rini [Tue, 17 Sep 2013 00:08:33 +0000 (20:08 -0400)]
Prepare v2013.10-rc3

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-spi
Tom Rini [Tue, 17 Sep 2013 00:02:50 +0000 (20:02 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-spi

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Fri, 13 Sep 2013 22:12:36 +0000 (18:12 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

11 years agoRevert "standalone-examples: support custom GCC lib"
Tom Rini [Tue, 10 Sep 2013 13:51:44 +0000 (09:51 -0400)]
Revert "standalone-examples: support custom GCC lib"

After further testing, this patch has two problems.  First,
examples/standalone/Makefile was already inherting PLATFORM_LIBS from
the top-level Makefile so this lead to duplicating the private libgcc.
Second, currently the private libgcc has a reference to 'hang' that is
not being fulfilled.

This reverts commit 4412db46468d5965da736d06f84d13e68a6e0b51.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge and reformat boards.cfg and MAINTAINERS
Albert ARIBAUD [Wed, 11 Sep 2013 13:52:51 +0000 (15:52 +0200)]
Merge and reformat boards.cfg and MAINTAINERS

Put all informations about targets, including state (active or
orphan) and maintainers, in boards.cfg; remove MAINTAINERS;
adjust the build system accordingly.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Thu, 12 Sep 2013 13:08:24 +0000 (09:08 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

11 years agoMerge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 11 Sep 2013 07:59:27 +0000 (09:59 +0200)]
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
tools/Makefile

11 years agoarm:goni:mmc: Add sd card detection and initialization.
Przemyslaw Marczak [Tue, 10 Sep 2013 09:34:49 +0000 (11:34 +0200)]
arm:goni:mmc: Add sd card detection and initialization.

This change allow to use sd card on Goni the same like mmc 0.
SD card is mmc dev 1, so it can be used like this: "fatls mmc 1:2".
SD card is inited even if eMMC initialization fails.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoarm:mmc:goni/exynos: Fix wrong mmc base register devices offset.
Przemyslaw Marczak [Tue, 3 Sep 2013 12:57:52 +0000 (14:57 +0200)]
arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.

On s5pc1xx mmc devices offset is multiply of 0x100000,
wrong value was 0x10000. Register offset always points
to mmc 0 before this change.

Add macro definition of mmc dev register offset to s5pc1xx and
exynos mmc.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Jaehoon Chung <jh80.chung at samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agodts: samsung: arndale: Fix include path
Chander Kashyap [Tue, 10 Sep 2013 08:11:36 +0000 (13:41 +0530)]
dts: samsung: arndale: Fix include path

As per new convention ARCH_CPU_DTS is not defined in "dtc/Makefile".
Hence Arndale comilation is failing. Fix this by adding proper include
file in "board/samsung/dts/exynos5250-arndale.dts".

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agopowerpc/mpc85xx: Add workaround for erratum A-005125
York Sun [Tue, 20 Aug 2013 22:09:43 +0000 (15:09 -0700)]
powerpc/mpc85xx: Add workaround for erratum A-005125

In a very rare condition, a system hang is possible when the e500 core
initiates a guarded load to PCI / PCIe /SRIO performs a coherent write
to memory. Please refer to errata document for more details. This erratum
applies to the following SoCs and their variants, if any.

BSC9132
BSC9131
MPC8536
MPC8544
MPC8548
MPC8569
MPC8572
P1010
P1020
P1021
P1022
P1023
P2020
C29x

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Scott Wood <scottwood@freescale.com>
11 years agopowerpc/p2041: fix I2C controller's offset
Shaohui Xie [Tue, 10 Sep 2013 08:15:07 +0000 (16:15 +0800)]
powerpc/p2041: fix I2C controller's offset

Without this patch, SPD access will fail which leads to DDR init fail.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Tested-by: Chris Packham <judge.packham@gmail.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Tom Rini [Mon, 9 Sep 2013 13:59:30 +0000 (09:59 -0400)]
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Tom Rini [Mon, 9 Sep 2013 13:35:38 +0000 (09:35 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

11 years agopowerpc/mpc85xx: Fix the I2C bus speed error on p1022
Tang Yuantian [Fri, 6 Sep 2013 02:45:40 +0000 (10:45 +0800)]
powerpc/mpc85xx: Fix the I2C bus speed error on p1022

The source clock frequency of I2C bus on p1022 is the platform(CCB)
clock, not CCB/2. The wrong source clock frequency leads to wrong
I2C bus speed setting. so, fixed it.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
11 years agoSPL: P1022DS: switch to new multibus/multiadapter support
Ying Zhang [Wed, 4 Sep 2013 09:03:45 +0000 (17:03 +0800)]
SPL: P1022DS: switch to new multibus/multiadapter support

- Added section "u_boot_list" in arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
- Use the function i2c_init_all instead of i2c_init

Signed-off-by: Ying Zhang <b40530@freescale.com>
11 years agoppc4xx: Fix GPIO handling in lwmon5 and lcd4_lwmon5 BSP
Stefan Roese [Mon, 26 Aug 2013 10:08:48 +0000 (12:08 +0200)]
ppc4xx: Fix GPIO handling in lwmon5 and lcd4_lwmon5 BSP

LCD4 needs a slightly different GPIO configuration than the
original LWMON5 variant. GPIO49 needs to be configured to a
default output value of 0 (permanent voltage supply).

Additionally lcd4 also needs to enable the LSB transmitter.

Signed-off-by: Stefan Roese <sr@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Sat, 7 Sep 2013 00:25:35 +0000 (20:25 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

11 years agocam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config header
Masahiro Yamada [Sun, 1 Sep 2013 06:04:27 +0000 (15:04 +0900)]
cam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config header

For most boards which define CONFIG_SPL_PAD_TO,
it is defined in config header files.
Currently, there exists only one exception, cam_enc_4xx board.

This patch moves CONFIG_SPL_PAD_TO definition
from board/ait/cam_enc_4xx/config.mk
to include/configs/cam_enc_4xx.h.

With this modification, we can delete a glue code
in the top level config.mk:

ifneq ($(CONFIG_SPL_PAD_TO),)
CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO)
endif

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Heiko Schocher <hs@denx.de>
11 years agoconfig.mk: Delete unnecessary code
Masahiro Yamada [Sun, 1 Sep 2013 06:04:26 +0000 (15:04 +0900)]
config.mk: Delete unnecessary code

Currently no makefiles (board-specific config.mk)
set the following variables:

CONFIG_SPL_TEXT_BASE
CONFIG_UBOOT_PAD_TO
CONFIG_RESET_VECTOR_ADDRESS
CONFIG_TPL_PAD_TO

For all target boards using above macros
they are set in header files (include/configs/*.h),
so we do not need to set them as CPPFLAGS.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agofw_env: fix writing environment for mtd devices
Oliver Metz [Thu, 29 Aug 2013 22:56:02 +0000 (00:56 +0200)]
fw_env: fix writing environment for mtd devices

Signed-off-by: Oliver Metz <oliver@freetz.org>
Tested-by: Luka Perkov <luka@openwrt.org>
11 years agofw_env: add redundant env support for MTD_ABSENT
Oliver Metz [Thu, 29 Aug 2013 22:56:01 +0000 (00:56 +0200)]
fw_env: add redundant env support for MTD_ABSENT

Signed-off-by: Oliver Metz <oliver@freetz.org>
Tested-by: Luka Perkov <luka@openwrt.org>
11 years agomail: Fix email address
Marek Vasut [Tue, 27 Aug 2013 21:32:11 +0000 (23:32 +0200)]
mail: Fix email address

Fix my email address.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoAlways build u-boot.img when using CONFIG_SPL_FRAMEWORK
Henrik Nordström [Mon, 26 Aug 2013 22:37:22 +0000 (00:37 +0200)]
Always build u-boot.img when using CONFIG_SPL_FRAMEWORK

Use of uImage formatted u-boot have long been preferred, and recent
changes to better support Falcon mode on MMC now enforces it on MMC.

Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
11 years agoahci: convert to use libata functions and definitions
Rob Herring [Sat, 24 Aug 2013 15:10:54 +0000 (10:10 -0500)]
ahci: convert to use libata functions and definitions

libata already has similar functions as implemented in the ahci code.
Refactor the code to use the libata variants and remove the dependency on
ata.h. Convert some defines to use the version from libata.h. Also, remove
some unnecessary memset's of bss data.

This is a step toward hopefully merging ahci.c and dw_ahsata.c which are
essentially the same driver.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoahci: increase spin-up timeout to 20 sec
Rob Herring [Sat, 24 Aug 2013 15:10:53 +0000 (10:10 -0500)]
ahci: increase spin-up timeout to 20 sec

Based on Linux libata code, most drives are less than 10 sec, but some
need up to 20 sec.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoahci: handle COMINIT received during spin-up
Rob Herring [Sat, 24 Aug 2013 15:10:52 +0000 (10:10 -0500)]
ahci: handle COMINIT received during spin-up

Some Intel SSDs can send a COMINIT after the initial COMRESET. This causes
the link to go down and we need to re-initialize the link.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoahci: move link bring-up handling to separate function
Rob Herring [Sat, 24 Aug 2013 15:10:51 +0000 (10:10 -0500)]
ahci: move link bring-up handling to separate function

Move the link bring-up handling to a separate weak function in order to
allow platforms to override it. This is needed on highbank platform which
needs special phy handling.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoahci: add defines for PORT_SCR_STAT register bits
Rob Herring [Sat, 24 Aug 2013 15:10:50 +0000 (10:10 -0500)]
ahci: add defines for PORT_SCR_STAT register bits

Replace hard-coded register values with proper defines for PORT_SCR_STAT
register.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoahci: fix memory leak in ata_scsiop_inquiry
Rob Herring [Sat, 24 Aug 2013 15:10:49 +0000 (10:10 -0500)]
ahci: fix memory leak in ata_scsiop_inquiry

This fixes a memory leak when scsi inquiry fails.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoahci: fix unaligned access
Rob Herring [Sat, 24 Aug 2013 15:10:48 +0000 (10:10 -0500)]
ahci: fix unaligned access

gcc 4.7 will generate unaligned accesses to local char arrays, so make
them static to avoid that.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoahci: use ports implemented map instead of num_ports
Richard Gibbs [Sat, 24 Aug 2013 15:10:47 +0000 (10:10 -0500)]
ahci: use ports implemented map instead of num_ports

The AHCI driver was incorrectly using the Capabilities register NP (number
of ports) field to determine which ports to activate. This commit changes
it to correctly use the PORTS_IMPL register as a port map.

Signed-off-by: Richard Gibbs <richard.gibbs@calxeda.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agostandalone-examples: support custom GCC lib
Jack Mitchell [Tue, 16 Jul 2013 13:44:23 +0000 (14:44 +0100)]
standalone-examples: support custom GCC lib

Add support for defining the gcc lib in standalone examples as is
done in the main u-boot Makefile

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
11 years agofs: fat: don't call disk_write with zero sector num
Wu, Josh [Wed, 24 Jul 2013 09:55:30 +0000 (17:55 +0800)]
fs: fat: don't call disk_write with zero sector num

In the set_cluster() function, it will convert the buffer size to sector
numbers. Then call disk_write() to write by sector.
For remaining buffer, the size is less than a sector, call disk_write()
again to write them in one sector.

But if the total buffer size is less then one sector, the original code
will call disk_write() with zero sector number. It is unnecessary.
So this patch fix this. Now it will not call disk_write() if total buffer size
is less than one sector.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
11 years agocompiler_gcc: do not redefine __gnu_attributes
Jeroen Hofstee [Sat, 10 Aug 2013 15:16:50 +0000 (17:16 +0200)]
compiler_gcc: do not redefine __gnu_attributes

gcc allows extensions to be non compiler specific by defining
__* macros for the attributes supported by gcc. Having a
different definition causes many warnings during the build
(cdefs.h on FreeBSD uses __attribute((__pure__)) where u-boot
uses __attribute__((pure)) for example). Do not redefine
these macros to suppress these warnings.

This patch ignores the checkpatch warning:
WARNING: __packed is preferred over __attribute__((packed))

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
11 years agogit-mailrc: Update MMC custodian
Pantelis Antoniou [Thu, 8 Aug 2013 16:15:47 +0000 (19:15 +0300)]
git-mailrc: Update MMC custodian

Update git-mailrc with my nick and replace afleming as mmc custodian.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-nios
Tom Rini [Fri, 6 Sep 2013 13:37:04 +0000 (09:37 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-nios

11 years agoam335x_evm.h: Add back the actual load of the kernel image
Robert P. J. Day [Wed, 4 Sep 2013 12:41:44 +0000 (08:41 -0400)]
am335x_evm.h: Add back the actual load of the kernel image

Somewhere along the line of refactoring the am335x header files, the
kernel image load was lost, so put it back in.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
11 years agosocfpga: Creating driver for Reset Manager
Chin Liang See [Wed, 7 Aug 2013 15:08:03 +0000 (10:08 -0500)]
socfpga: Creating driver for Reset Manager

Consolidating reset code into reset_manager.c. Also
separating reset configuration for virtual target and
real hardware Cyclone V development kit

Signed-off-by: Chin Liang See <clsee@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
11 years agosocfpga: Adding configuration for development kit
Chin Liang See [Wed, 7 Aug 2013 15:06:56 +0000 (10:06 -0500)]
socfpga: Adding configuration for development kit

Separating the configuration file for Virtual
Target and real hardware Cyclone V development kit

Signed-off-by: Chin Liang See <clsee@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
11 years agonios2: fix missing comment terminator from SPDX License commit
Thomas Chou [Tue, 3 Sep 2013 01:36:04 +0000 (09:36 +0800)]
nios2: fix missing comment terminator from SPDX License commit

The commit 1a4596601fd395f3afb8f82f3f840c5e00bdd57a
  Add GPL-2.0+ SPDX-License-Identifier to source files

generated a warning due to a missing comment terminator.
  longlong.h:7:1: warning: "/*" within comment

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
11 years agoarm: lds: Remove libgcc eabi exception handling tables
Michal Simek [Thu, 25 Jul 2013 14:16:46 +0000 (16:16 +0200)]
arm: lds: Remove libgcc eabi exception handling tables

Remove ARM eabi exception handling tables (for frame unwinding).
AFAICT, u-boot stubs away the frame unwiding routines, so the tables will
more or less just consume space. It should be OK to remove them.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@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 [Thu, 5 Sep 2013 10:04:49 +0000 (12:04 +0200)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 5 Sep 2013 09:15:26 +0000 (11:15 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.

11 years agoARM: atmel: sama5d3: drop unused CONFIG_NET_MULTI
Bo Shen [Wed, 28 Aug 2013 14:36:56 +0000 (14:36 +0000)]
ARM: atmel: sama5d3: drop unused CONFIG_NET_MULTI

Drop unused CONFIG_NET_MULTI

Signed-off-by: Bo Shen <voice.shen@gmail.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agomtd: atmel_nand: pmecc: fix bug fail to correct bit error in 1024-bytes sector
Wu, Josh [Fri, 23 Aug 2013 07:09:05 +0000 (15:09 +0800)]
mtd: atmel_nand: pmecc: fix bug fail to correct bit error in 1024-bytes sector

The PMECC use BCH algorithm to correct error. In BCH algorithm, the
primitive polynomial value is GF(2^13) for 512-bytes sector size. And it is
GF(2^14) for 1024-bytes sector size.

This patch will choose correct degree of the remainders (13 or 14) for
different sector size.
Tested in AT91SAM9X5-EK with MLC nand flash.

More detail can be refered to section 5.4.1 of:
  AT91SAM ARM-based Embedded MPU Application Note
  <http://www.atmel.com/Images/doc11127.pdf>

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoMerge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 4 Sep 2013 12:06:56 +0000 (14:06 +0200)]
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

11 years agoMerge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 4 Sep 2013 09:50:25 +0000 (11:50 +0200)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

11 years agobootm: allow correct bounds-check of destination
Kees Cook [Fri, 16 Aug 2013 14:59:16 +0000 (07:59 -0700)]
bootm: allow correct bounds-check of destination

While nothing presently examines the destination size, it should at
least be correct so that future users of sys_mapmem() will not be
surprised. Without this, it might be possible to overflow memory.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agolzo: correctly bounds-check output buffer
Kees Cook [Fri, 16 Aug 2013 14:59:15 +0000 (07:59 -0700)]
lzo: correctly bounds-check output buffer

This checks the size of the output buffer and fails if it was going to
overflow the buffer during lzo decompression.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agolzma: correctly bounds-check output buffer
Kees Cook [Fri, 16 Aug 2013 14:59:14 +0000 (07:59 -0700)]
lzma: correctly bounds-check output buffer

The output buffer size must be correctly passed to the lzma decoder or
there is a risk of overflowing memory during decompression. Switching
to the LZMA_FINISH_END mode means nothing is left in an unknown state
once the buffer becomes full.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agogzip: correctly bounds-check output buffer
Kees Cook [Fri, 16 Aug 2013 14:59:13 +0000 (07:59 -0700)]
gzip: correctly bounds-check output buffer

The output buffer size must not be reset by the gzip decoder or there
is a risk of overflowing memory during decompression.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agodocumentation: add more compression configs
Kees Cook [Fri, 16 Aug 2013 14:59:12 +0000 (07:59 -0700)]
documentation: add more compression configs

This adds the missing compression config items to the README.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agosandbox: add compression tests
Kees Cook [Fri, 16 Aug 2013 14:59:11 +0000 (07:59 -0700)]
sandbox: add compression tests

This adds the "test_compression" command when building the sandbox. This
tests the existing compression and decompression routines for simple
sanity and for buffer overflow conditions.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agosandbox: Correct compiler warnings in cmd_bootm/cmd_ximg
Simon Glass [Fri, 30 Aug 2013 17:00:09 +0000 (11:00 -0600)]
sandbox: Correct compiler warnings in cmd_bootm/cmd_ximg

Correct the following warnings found with sandbox when compression
is enabled.

cmd_bootm.c: In function 'bootm_load_os':
cmd_bootm.c:443:11: warning: passing argument 4 of 'lzop_decompress' from incompatible pointer type [enabled by default]
/usr/local/google/c/cosarm/src/third_party/u-boot/files/include/linux/lzo.h:31:5: note: expected 'size_t *' but argument is of type 'uint *'
cmd_ximg.c: In function 'do_imgextract':
cmd_ximg.c:225:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
cmd_ximg.c:225:14: warning: 'hdr' may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>
11 years agoMerge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 3 Sep 2013 12:59:18 +0000 (14:59 +0200)]
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

11 years agoMerge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
Albert ARIBAUD [Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)]
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

Conflicts:
arch/arm/include/asm/arch-zynq/hardware.h

The conflict above was trivial and solved during merge.

11 years agoPrepare v2013.10-rc2
Tom Rini [Mon, 2 Sep 2013 18:20:36 +0000 (14:20 -0400)]
Prepare v2013.10-rc2

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoi.MX6: Set and clear the gating bits for Phase Fractional Dividers
Eric Nelson [Thu, 29 Aug 2013 19:41:46 +0000 (12:41 -0700)]
i.MX6: Set and clear the gating bits for Phase Fractional Dividers

This addresses silicon errata ERR006282 as described in this
document:
https://community.freescale.com/docs/DOC-94581

Also implemented in Freescale's 2009.08-based release:

http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/
Commit id: b7c5badf94ffbe6cd0845efbb75e16e05e3af404

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoi.MX6: nitrogen6x: Don't bother setting PLL3(480) PFD1 divisor
Eric Nelson [Thu, 29 Aug 2013 19:37:36 +0000 (12:37 -0700)]
i.MX6: nitrogen6x: Don't bother setting PLL3(480) PFD1 divisor

This clock isn't feeding anything under U-Boot, so there's no
point in changing it from power-on default.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>