]> git.sur5r.net Git - u-boot/log
u-boot
11 years agodrivers/mmc/dw_mmc - remove extra arch specific "asm/arch/clk.h" inclusion
Alexey Brodkin [Mon, 15 Jul 2013 11:30:30 +0000 (15:30 +0400)]
drivers/mmc/dw_mmc - remove extra arch specific "asm/arch/clk.h" inclusion

1. No contents of "asm/arch/clk.h" is used within "dw_mmc.c".
2. If arch doesn't have "asm/arch/clk.h" driver won't build.

Without mentioned inclusion dw_mmc driver could be built for arches
other than ARM. For ARM driver still builds without it.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Cc: Amar <amarendra.xt@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agoPowerpc: eSDHC: Fix mmc read write err in uboot of T4240QDS board
Haijun.Zhang [Mon, 1 Jul 2013 06:26:01 +0000 (14:26 +0800)]
Powerpc: eSDHC: Fix mmc read write err in uboot of T4240QDS board

Fill the right command type when using CMD12 to stop data transfer.

Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
CC: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
CC: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
11 years agoarm:samsung:trats:fix: Restore proper orientation of TRATS's LCD panel
Łukasz Majewski [Mon, 15 Jul 2013 14:09:50 +0000 (16:09 +0200)]
arm:samsung:trats:fix: Restore proper orientation of TRATS's LCD panel

Before setting: mipi_lcd_device.reverse_panel = 1, the Trats's LCD panel
was flipped by 180 degrees.

The flip was caused by following change:
Exynos: Change get_timer() to work correctly
SHA1: 3d00c0cb96ff93a929700b80d89cb905e5ab5315

This commit fixed udelay(), which is necessary (due to HW LCD controller
oddity) for mipi-dsi correct operation. As a result the display orientation
has been switched.

As a follow up, the hwrevision() function has been removed, since it was
used only in this particular place.

Test HW: Trats Exynos4210 rev 0.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoarm:exynos:fix: Fix clock calculation for Exynos4210 based targets.
Łukasz Majewski [Fri, 12 Jul 2013 17:08:25 +0000 (19:08 +0200)]
arm:exynos:fix: Fix clock calculation for Exynos4210 based targets.

Provide proper setting for the APLL fout frequency calculation for
Exynos4 based targets (especially Exynos4210 - Trats board).

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
11 years agoPPC MPC83xx: Fix MPC8323ERDB build warning
Wolfgang Denk [Sun, 14 Jul 2013 17:42:40 +0000 (19:42 +0200)]
PPC MPC83xx: Fix MPC8323ERDB build warning

Fix:

mpc8323erdb.c: In function 'mac_read_from_eeprom':
mpc8323erdb.c:198:3: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Timur Tabi <timur@tabi.org>
cc: Kim Phillips <kim.phillips@freescale.com>

11 years agoFix ext2/ext4 filesystem accesses beyond 2TiB
Frederic Leroy [Wed, 26 Jun 2013 16:11:25 +0000 (18:11 +0200)]
Fix ext2/ext4 filesystem accesses beyond 2TiB

With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type,
which is required to represent block numbers for storage devices that
exceed 2TiB (the block size usually is 512B), e.g. recent hard drives

We now use lbaint_t for partition offset to reflect the lbaint_t change,
and access partitions beyond or crossing the 2.1TiB limit.
This required changes to signature of ext4fs_devread(), and type of all
variables relatives to block sector.

ext2/ext4 fs uses logical block represented by a 32 bit value. Logical
block is a multiple of device block sector. To avoid overflow problem
when calling ext4fs_devread(), we need to cast the sector parameter.

Signed-off-by: Frédéric Leroy <fredo@starox.org>
11 years agocommon: remove unaligned access error in bootmenu_getoption()
Lan Yixun (dlan) [Thu, 27 Jun 2013 10:58:53 +0000 (18:58 +0800)]
common: remove unaligned access error in bootmenu_getoption()

Some ARM compilers may emit code that makes unaligned accesses when
faced with constructs such as:

    char name[12] = "bootmenu_";

same fix as commit: 064d55f8bc8d7d205ed0be6abb6717e92eeb7cad

=========================================================
data abort

    MAYBE you should read doc/README.arm-unaligned-accesses

pc : [<3ff4b60c>]          lr : [<3ff4b7b0>]
sp : 3f346a58  ip : 3ff9c8e6     fp : 02000060
r10: 00000000  r9 : 3df47fc0     r8 : 3f347f40
r7 : 00000000  r6 : 00000000     r5 : 00000003  r4 : 3f759140
r3 : 000003f0  r2 : 00000000     r1 : 000003f1  r0 : 00000000
Flags: nzCv  IRQs on  FIQs off  Mode SVC_32
Resetting CPU ...
======================================================

Signed-off-by: Lan Yixun (dlan) <dennis.yxun@gmail.com>
11 years agocramfs: fix bug for wrong filename comparison
Holger Brunck [Mon, 8 Jul 2013 07:06:49 +0000 (09:06 +0200)]
cramfs: fix bug for wrong filename comparison

"cramfsload uImage_1" succeeds even though the actual file is named
"uImage".

Fix file name comparison when one name is the prefix of the other.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Wolfgang Denk <wd@denx.de>
cc: Albert ARIBAUD <albert.u.boot@aribaud.net>

11 years agopatman: README documentation nits (unit test)
Gerhard Sittig [Sun, 14 Jul 2013 09:27:45 +0000 (11:27 +0200)]
patman: README documentation nits (unit test)

adjust instructions for the invocation of Patman's self test: the -t
flag appears to have a different meaning now, refer to the --test option
for the builtin unit test; adjust a directory location and make sure to
run the file which resides in the source directory

Signed-off-by: Gerhard Sittig <gsi@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoscsi: Correct types of scsi_read/write()
Simon Glass [Wed, 3 Jul 2013 14:11:41 +0000 (07:11 -0700)]
scsi: Correct types of scsi_read/write()

The block device expects to see lbaint_t for the blknr parameter. Change
the SCSI read/write functions to suit.

This fixes the following build warnings for coreboot:

cmd_scsi.c: In function ‘scsi_scan’:
cmd_scsi.c:119:30: error: assignment from incompatible pointer type [-Werror]
cmd_scsi.c:120:32: error: assignment from incompatible pointer type [-Werror]

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoRevert "MIPS: Jz4740: Add qi_lb60 board support"
Tom Rini [Mon, 15 Jul 2013 13:19:39 +0000 (09:19 -0400)]
Revert "MIPS: Jz4740: Add qi_lb60 board support"

The files board/qi/qi_lb60/qi_lb60.c and include/configs/qi_lb60.h were
licensed under the GPL v3 or later, and not v2 or later.  As this is
incompatible with the project, revert this board support until the
responsible parties are available to re-license (if so desired) under
GPL v2.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoPrepare v2013.07-rc3 v2013.07-rc3
Tom Rini [Fri, 12 Jul 2013 21:16:19 +0000 (17:16 -0400)]
Prepare v2013.07-rc3

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Tom Rini [Fri, 12 Jul 2013 21:18:59 +0000 (17:18 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

11 years agobootm: Handle errors consistently
Simon Glass [Wed, 10 Jul 2013 13:25:33 +0000 (09:25 -0400)]
bootm: Handle errors consistently

A recent bootm fix left the error path incomplete. If CONFIG_TRACE is
set it may still not be a supported command, so cover that with the
unsupported subcommand print.  Once we handle BOOTM_STATE_OS_GO, we can
just move into the error handler itself, no need for a goto there.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Update slightly based on Simon's changes to also cover
CONFIG_TRACE/BOOTM_STATE_FAKE_OS_GO]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agomtd: mxc_nand: Fix crash after MTD resync
Marek Vasut [Wed, 3 Jul 2013 00:34:34 +0000 (02:34 +0200)]
mtd: mxc_nand: Fix crash after MTD resync

The driver triggered a BUG() in nand_base.c:3214/nand_scan_tail()
because the ecc.strength was not set in NAND_ECC_HW_SYNDROME ECC
mode.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Benoit Thebaudeau <benoit.thebaudeau@advansee.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agocommon/image.c: Fix regression with ramdisk load/entry points in FIT
Stefano Babic [Fri, 12 Jul 2013 13:09:23 +0000 (15:09 +0200)]
common/image.c: Fix regression with ramdisk load/entry points in FIT

A FIT image with a ramdisk that sets the entry or load points to 0x0
must be treated as meaning "leave in place" and NOT "relocate to 0x0".
This regression was introduced in a51ec63.

Signed-off-by: Stefano Babic <sbabic@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Fri, 12 Jul 2013 14:36:48 +0000 (10:36 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
11 years agobootm: Correct the arguments for the ELF image loader
Simon Glass [Thu, 11 Jul 2013 06:08:11 +0000 (23:08 -0700)]
bootm: Correct the arguments for the ELF image loader

The arguments were out of place since commit 983c72f, since this file was
missed and not tested. Correct this.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Use selected configuration for ramdisk and fdt
Simon Glass [Thu, 11 Jul 2013 06:08:10 +0000 (23:08 -0700)]
bootm: Use selected configuration for ramdisk and fdt

If a specific configuraion is selected by the bootm command, e.g. with
'bootm 84000000#recoveryconf' we must honour this for not just the kernel,
but also the ramdisk and FDT.

In the conversion to using a common fit_image_load() function for loading
images from FITs (commits a51ec63 and 53f375f) this feature was lost.
Reinstate it by passing the selected configuration back from
fit_image_load() to boot_get_kernel(), then use this configuration
(which is stored in images->fit_uname_cfg) in both boot_get_ramdisk()
and boot_get_fdt().

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoblackfin: x86: bootm: Handle PREP stage of bootm
Simon Glass [Thu, 11 Jul 2013 06:08:09 +0000 (23:08 -0700)]
blackfin: x86: bootm: Handle PREP stage of bootm

The OS function is now always called with the PREP stage. Adjust the
remaining bootm OS functions to deal with this correctly.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Remove extra OK message
Simon Glass [Thu, 11 Jul 2013 06:08:08 +0000 (23:08 -0700)]
bootm: Remove extra OK message

This is not needed as we already print 'OK' later in all cases.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agocmd_bootm.c: Re-order bootm_load_os return check for ELDK4.2
Tom Rini [Thu, 11 Jul 2013 13:35:23 +0000 (09:35 -0400)]
cmd_bootm.c: Re-order bootm_load_os return check for ELDK4.2

With ELDK4.2 we were getting a warning that load_end may be used
uninitialized in calling lmb_reserve.  This could not be the case,
however.  If we re-order the checks (and make them slightly clearer as
well) the warning goes away.  bootm_load_os may only return 0 on
success, BOOTM_ERR_OVERLAP in a non-fatal overlap (already covered in
comments) or a fatal BOOTM_ERR that is covered in the error handler.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Fri, 12 Jul 2013 11:20:35 +0000 (13:20 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agomx53ard: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:44 +0000 (18:52 -0300)]
mx53ard: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx51evk: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:43 +0000 (18:52 -0300)]
mx51evk: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agowandboard: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:42 +0000 (18:52 -0300)]
wandboard: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx6slevk: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:41 +0000 (18:52 -0300)]
mx6slevk: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx6qsabrelite: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:40 +0000 (18:52 -0300)]
mx6qsabrelite: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx53loco: Change default environment to cope with OE changes
Otavio Salvador [Fri, 28 Jun 2013 21:52:39 +0000 (18:52 -0300)]
mx53loco: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it
does not raise warnings during the boot regarding unkown partition
being used for U-Boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Jason Liu <r64343@freescale.com>
11 years agonet: fec: Avoid MX28 bus sync issue
Marek Vasut [Thu, 11 Jul 2013 23:03:04 +0000 (01:03 +0200)]
net: fec: Avoid MX28 bus sync issue

The MX28 multi-layer AHB bus can be too slow and trigger the
FEC DMA too early, before all the data hit the DRAM. This patch
ensures the data are written in the RAM before the DMA starts.
Please see the comment in the patch for full details.

This patch was produced with an amazing help from Albert Aribaud,
who pointed out it can possibly be such a bus synchronisation
issue.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
11 years agonet: fec: Remove bogus flush_dcache_range() call
Marek Vasut [Thu, 11 Jul 2013 15:23:26 +0000 (17:23 +0200)]
net: fec: Remove bogus flush_dcache_range() call

Remove incorrectly called and duplicate flush_dcache_range() call
from fec_mxc driver. The call is not needed, since the caches are
already flushed in fec_tbd_init(), moreover the second argument should
be the ending address, not size.

Signed-off-by: Marek Vasut <marex@denx.de>
Reported-by: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agom28evk: add trimffs to nand command
Marek Vasut [Sun, 7 Jul 2013 18:20:26 +0000 (20:20 +0200)]
m28evk: add trimffs to nand command

this is usefull when writing an UBI image which contains
and UBIFS volume (check README.nand and UBI FAQ for more
details)

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agoARM: tegra: enable LCD panel on Ventana
Stephen Warren [Tue, 18 Jun 2013 15:46:52 +0000 (09:46 -0600)]
ARM: tegra: enable LCD panel on Ventana

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoARM: tegra: enable LCD panel on Harmony
Stephen Warren [Tue, 18 Jun 2013 15:46:51 +0000 (09:46 -0600)]
ARM: tegra: enable LCD panel on Harmony

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra: Config: Enable Tegra30/Tegra114 USB function
Jim Lin [Fri, 21 Jun 2013 11:05:48 +0000 (19:05 +0800)]
Tegra: Config: Enable Tegra30/Tegra114 USB function

Add USB EHCI, storage and network support.

Tested on Tegra30 Cardhu, and Tegra114 Dalmore
platforms. All works well.

Signed-off-by: Jim Lin <jilin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114
Jim Lin [Fri, 21 Jun 2013 11:05:47 +0000 (19:05 +0800)]
ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114

Tegra30 and Tegra114 are compatible except PLL parameters.

Tested on Tegra30 Cardhu, and Tegra114 Dalmore
platforms. All works well.

Signed-off-by: Jim Lin <jilin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoARM: Tegra: FDT: Add USB EHCI function for T30/T114
Jim Lin [Fri, 21 Jun 2013 11:05:46 +0000 (19:05 +0800)]
ARM: Tegra: FDT: Add USB EHCI function for T30/T114

Add DT node for USB EHCI function.
Add support for T30-Cardhu, T30-Beaver, T114-Dalmore boards.

Signed-off-by: Jim Lin <jilin@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoMerge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 10 Jul 2013 18:40:47 +0000 (20:40 +0200)]
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

11 years agousb: pxa27x_udc: fix compiler warnings
Mike Dunn [Wed, 26 Jun 2013 19:33:54 +0000 (12:33 -0700)]
usb: pxa27x_udc: fix compiler warnings

Newer gcc versions warn about unused variables.  This patch corrects a few of
those warnings that popped up in a build for the palmtreo680 board.

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
11 years agodfu: Update DFU's authorship history
Łukasz Majewski [Fri, 5 Jul 2013 09:40:47 +0000 (11:40 +0200)]
dfu: Update DFU's authorship history

The DFU's state machine original implementation author and copyright were
missing.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
11 years agocmd_bootm.c: Make bootz handle BOOTM_STATE_FINDOTHER itself
Tom Rini [Tue, 9 Jul 2013 19:33:25 +0000 (15:33 -0400)]
cmd_bootm.c: Make bootz handle BOOTM_STATE_FINDOTHER itself

As a zImage does not have a U-Boot header, we cannot really do what
BOOTM_STATE_FINDOTHER does, exactly.  Break the ramdisk/fdt portions of
bootm_find_other into bootm_find_ramdisk/fdt which can be called in both
cases.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agocmd_bootm.c: Make bootz consume 'bootz' from argv, decrement argc
Tom Rini [Tue, 9 Jul 2013 19:32:34 +0000 (15:32 -0400)]
cmd_bootm.c: Make bootz consume 'bootz' from argv, decrement argc

Like 'bootm', 'bootz' needs to consume 'bootz' so that the rest of the
state functions will work.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agobootm: Add the missing PREP stage to bootz and correct image handling
Simon Glass [Thu, 4 Jul 2013 20:26:11 +0000 (13:26 -0700)]
bootm: Add the missing PREP stage to bootz and correct image handling

In the recent bootm refactor, the PREP stage was missing in the bootz
command. This causes unpredictable behaviour.

The use of a local variable means that the reset of cmd_bootm.c does not
in fact use the same image structure, so remove this.

Also manually set the OS type to Linux, since this is the only possibility
at present, and we need to select the right boot function.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Clean up bootz_setup() function
Simon Glass [Thu, 4 Jul 2013 20:26:10 +0000 (13:26 -0700)]
bootm: Clean up bootz_setup() function

This function has no prototype in the headers and passes void * around, thus
requiring several casts. Tidy this up.

- Add new patch to clean up bootz_setup() function

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Require boot function only if it is about to be used
Simon Glass [Thu, 4 Jul 2013 20:26:09 +0000 (13:26 -0700)]
bootm: Require boot function only if it is about to be used

The original bootm code (before commit 35fc84f) did not check for a valid
boot function in the subcommand case, which was incorrect.

This check was introduced in all cases, but in fact we should only check
for the function when we need it. Otherwise in some cases the check fires
before the OS type is known.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Disable interrupts only when loading
Simon Glass [Thu, 4 Jul 2013 20:26:08 +0000 (13:26 -0700)]
bootm: Disable interrupts only when loading

With the move of the interrupt code to earlier in the sequence, we
exposed a problem where the interrupts are disabled at each bootm
stage. This is not correct - it should be done only once. Let's disable
interrupts in the LOAD stage. Put the code in a function for clarity.

Also, bootz lost its interrupt code altogether, so reinstate it.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Wed, 10 Jul 2013 12:42:25 +0000 (08:42 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-video

11 years agoEXYNOS: Resolve the i2c compilation error
Amar [Wed, 10 Jul 2013 05:12:29 +0000 (10:42 +0530)]
EXYNOS: Resolve the i2c compilation error

This patch resolves the below mentioned compilation error of i2c driver
for non-FDT case

Compilation error:
s3c24x0_i2c.c: In function 'board_i2c_init':
s3c24x0_i2c.c:544:18: error: 'CONFIG_MAX_I2C_NUM' undeclared (first use
in this function) s3c24x0_i2c.c:544:18: note: each undeclared
identifier is reported only once for each function it appears in
s3c24x0_i2c.c:545:3: warning: implicit declaration of function

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: Amar <amarendra.xt@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoarm: exynos: fix clock calculation
Minkyu Kang [Fri, 5 Jul 2013 10:08:33 +0000 (19:08 +0900)]
arm: exynos: fix clock calculation

There are differnce with clock calcuation by cpu variations.
This patch will fix it according to user manual.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
11 years agovideo: consolidate splash screen alignment code
Anatolij Gustschin [Mon, 1 Jul 2013 22:04:05 +0000 (00:04 +0200)]
video: consolidate splash screen alignment code

Code for checking "splashpos" environment variable is
duplicated in drivers, move it to the common function.
Call this function also in the bmp display command to
consider "splashpos" settings.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agopower:bat:trats: Break battery charging with ctrl+C
Łukasz Majewski [Tue, 25 Jun 2013 13:28:15 +0000 (15:28 +0200)]
power:bat:trats: Break battery charging with ctrl+C

Add support for disabling battery charging with ctrl+C keyboard
combination pressed.
Moreover the battery update is done more frequently.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoarm:trats: Increase malloc pool size (for DFU ext4 transfers)
Łukasz Majewski [Fri, 28 Jun 2013 16:43:53 +0000 (18:43 +0200)]
arm:trats: Increase malloc pool size (for DFU ext4 transfers)

Commit:
dfu: make data buffer size configurable
SHA1: 89a72b2e0e141042c9109185e02d39b2107ffc62

replaced statically allocated buffers with one allocated with memalign.

Malloc pool size of 1MiB was too small, since we needed bigger buffer to
transfer for example uImage.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoEXYNOS: Move files from board/samsung to arch/arm
Rajeshwari Shinde [Thu, 4 Jul 2013 06:59:17 +0000 (12:29 +0530)]
EXYNOS: Move files from board/samsung to arch/arm

This patch performs the following:

1) Convert the assembly code for memory and clock initialization to C code.
2) Move the memory and clock init codes from board/samsung to arch/arm
3) Creat a common lowlevel_init file across Exynos4 and Exynos5. Converted
   the common lowlevel_init from assembly to C-code
4) Made spl_boot.c and tzpc_init.c common for both exynos4 and exynos5.
5) Enable CONFIG_SKIP_LOWLEVEL_INIT as stack pointer initialisation is already
   done in _main.
6) exynos-uboot-spl.lds made common across SMDKV310, Origen and SMDK5250.

TEST: Tested SD-MMC boot on SMDK5250 and Origen.
      Tested USB and SPI boot on SMDK5250
      Compile tested for SMDKV310.

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoEXYNOS4210: Configure GPIO for uart
Rajeshwari Shinde [Thu, 4 Jul 2013 06:59:16 +0000 (12:29 +0530)]
EXYNOS4210: Configure GPIO for uart

This patch configures the gpio values for UART
on Origen and SMDKV310 using pinmux

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoEXYNOS: LDS file move to common
Rajeshwari Shinde [Thu, 4 Jul 2013 06:59:15 +0000 (12:29 +0530)]
EXYNOS: LDS file move to common

smdk5250-uboot-spl.lds is moved to common folder, so that it can be reused.
It is renamed to exynos-uboot-spl.lds

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoEXYNOS: Add API for power reset and exit wakeup
Rajeshwari Shinde [Thu, 4 Jul 2013 06:59:14 +0000 (12:29 +0530)]
EXYNOS: Add API for power reset and exit wakeup

This patch adds APIs to get power reset status and exit the wakeup condition for
both exynos5 and exynos4

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agocmd_bootm.c: Correct check/return for unsupported sub-command
Tom Rini [Mon, 1 Jul 2013 13:09:23 +0000 (09:09 -0400)]
cmd_bootm.c: Correct check/return for unsupported sub-command

With the do_bootm_states re-organization, we have the call to any
potential sub-commands in a single spot.  If one fails, we can then stop
right there and return to the caller.  Prior to these calls we have
already ensured that ret is zero so we will not be returning this error
for some other case.

Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agocosmetic: README.SPL: fix a typo
Masahiro Yamada [Tue, 2 Jul 2013 06:42:47 +0000 (15:42 +0900)]
cosmetic: README.SPL: fix a typo

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoMakefile: fix readelf usage
Andreas Bießmann [Tue, 2 Jul 2013 06:37:37 +0000 (08:37 +0200)]
Makefile: fix readelf usage

Some OS (like OS X) do not provide a generic readelf. We should enforce to use
the toochain provided readelf instead, to do so use $(CROSS_COMPILE)readelf.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Tested-by: Lubomir Popov <lpopov@mm-sol.com>
11 years agotools/proftool: remove REG_NOERROR
Andreas Bießmann [Tue, 2 Jul 2013 06:37:36 +0000 (08:37 +0200)]
tools/proftool: remove REG_NOERROR

Remove non portable usage of REG_NOERROR.
BSD (like OS X) variants of regex.h do not declare REG_NOERROR, even GNU
regex(3) does not mention REG_NOERROR, just remove it.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
11 years agolib/rsa/rsa-sig.c: compile on OS X
Andreas Bießmann [Tue, 2 Jul 2013 06:37:35 +0000 (08:37 +0200)]
lib/rsa/rsa-sig.c: compile on OS X

Interfaces exposed by error.h seems not to be used in rsa-sig.c, remove it.
This also fixes an compile error on OS X:

---8<---
u-boot/lib/rsa/rsa-sign.c:23:19: error: error.h: No such file or directory
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Tested-by: Lubomir Popov <lpopov@mm-sol.com>
11 years agodfu:ext4:fix Fix DFU upload functionality
Łukasz Majewski [Fri, 28 Jun 2013 16:41:50 +0000 (18:41 +0200)]
dfu:ext4:fix Fix DFU upload functionality

For the first eMMC read of data for upload, use the "large" dfu_buf (now
configurable) instead of usb request buffer allocated at composite layer
(which is 4KiB) [*].

For eMMC the whole file is read, which usually is larger than the buffer [*]
provided with usb request.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Tom Rini <trini@ti.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
11 years agodfu:ext4:fix Fix ext4{read|write} command formatting
Łukasz Majewski [Fri, 28 Jun 2013 16:41:49 +0000 (18:41 +0200)]
dfu:ext4:fix Fix ext4{read|write} command formatting

In the following commit:
"dfu: Support larger than memory transfers."
SHA1: ea2453d56b8860dbd18a3c517531ffc8dcb5c839

The ext4{read|write} command formatting has been changed. It removed
a write mandatory [sizebytes] parameter.

It extents DFU_FS_EXT4 case at mmc_file_op to provide mandatory
parameter for DFU write.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Tom Rini <trini@ti.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Wed, 3 Jul 2013 12:40:58 +0000 (08:40 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

11 years agoARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on OMAP5
Axel Lin [Fri, 21 Jun 2013 10:54:25 +0000 (18:54 +0800)]
ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on OMAP5

The omap_gpio driver is used by AM33XX, OMAP3/4, OMAP54XX and DRA7XX SoCs.
These SoCs have different gpio count but currently omap_gpio driver uses hard
coded 192 which is wrong.

This patch fixes this issue by:
1. Move define of OMAP_MAX_GPIO to all arch/arm/include/asm/arch-omap*/gpio.h.
2. Update gpio bank settings and enable GPIO modules 7 & 8 clocks for OMAP5.

Thanks for Lubomir Popov to provide valuable comments to fix this issue.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Lubomir Popov <lpopov@mm-sol.com>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoARM: OMAP4+: Fix MA detection during SDRAM_AUTO_DETECTION
Lokesh Vutla [Wed, 19 Jun 2013 05:20:45 +0000 (10:50 +0530)]
ARM: OMAP4+: Fix MA detection during SDRAM_AUTO_DETECTION

During SDRAM_AUTO_DETECTION MA is not configured.
For Soc's > OMAP4460 MA is present. So populating
MA for the same.

Tested on OMAP4430 PANDA, OMAP4460 PANDA.

Reported-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoam33xx: fix the ddr_cmdtctrl structure
Ilya Ledvich [Mon, 17 Jun 2013 13:59:27 +0000 (16:59 +0300)]
am33xx: fix the ddr_cmdtctrl structure

Fix the wrong mapping between the DDR I/O control registers on AM33XX
SoCs and the software representation in the SPL code.
The most recent public TRM defines the following DDR I/O control registers
offsets:
 * ddr_cmd0_ioctrl : offset 0x44E11404
 * ddr_cmd1_ioctrl : offset 0x44E11408
 * ddr_cmd2_ioctrl : offset 0x44E1140C
 * ddr_data0_ioctrl: offset 0x44E11440
 * ddr_data1_ioctrl: offset 0x44E11444

While the struct ddr_cmdtctrl has also some reserved bits in the beginning.
The struct is mapped to the address 0x44E11404. As a result "cm0ioctl" points
to the ddr_cmd1_ioctrl register, "cm1ioctl" to the ddr_cmd2_ioctrl and etc.
Registers ddr_cmd0_ioctrl and ddr_data0_ioctrl are never configured because
of this mapping mismatch.

Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk>
11 years agousb: omap: ulpi: fix ulpi transceiver access
Michael Trimarchi [Mon, 10 Jun 2013 16:18:04 +0000 (18:18 +0200)]
usb: omap: ulpi: fix ulpi transceiver access

This patch fix the omap access to the transceiver
configuration registers using the ulpi bus. As reported by
the documentation the bit31 is used only to check if the
transaction is done or still running and the reading and
writing operation have different offset and have different
values. What we need to do at the end of a transaction is
leave the bus in done state. Anyway an error using the ulpi
omap register is not recoverable so any error give out the
usage of this interface.

Tested on a custom OMAP5430 board with a TUSB1210 ULPI PHY
on USBB1.

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Lubomir Popov <lpopov@mm-sol.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoavr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux
Andreas Bießmann [Tue, 2 Jul 2013 11:57:44 +0000 (13:57 +0200)]
avr32/m68k/microblaze/nds32/nios2/openrisc/sh/sparc: fix do_bootm_linux

Commit 35fc84fa1ff51e15ecd3e464dac87eb105ffed30 broke bootm on avr32. It
requires to call do_bootm_linux() with flag set to BOOTM_STATE_OS_PREP before
calling it again with flag set to BOOTM_STATE_OS_GO.
Fix this by allowing flag set to BOOTM_STATE_OS_PREP, this however will
require a complete refactoring later on.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
[trini: Apply to m68k, microblaze, nds32, nios2, openrisc, sh and sparc]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoomap: cm_t35: Fix cm_t35 for weak splash_screen_prepare
Robert Winkler [Mon, 17 Jun 2013 18:31:31 +0000 (11:31 -0700)]
omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare

Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agovideo: lcd: Make splash_screen_prepare weak, remove config macro
Robert Winkler [Mon, 17 Jun 2013 18:31:30 +0000 (11:31 -0700)]
video: lcd: Make splash_screen_prepare weak, remove config macro

Remove CONFIG_SPLASH_SCREEN_PREPARE from README
Add doc/README.splashprepare to document functionality

Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agovideo: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO
Robert Winkler [Mon, 17 Jun 2013 18:31:29 +0000 (11:31 -0700)]
video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO

Create splash.c/h to put the function and any future common splash
screen code in.

Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agolcd: align bmp header when uncopmressing image
Piotr Wilczek [Wed, 5 Jun 2013 06:14:30 +0000 (08:14 +0200)]
lcd: align bmp header when uncopmressing image

When compressed image is loaded, it must be decompressed
to an aligned address + 2 to avoid unaligned access exception
on some ARM platforms.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Anatolij Gustschin <agust@denx.de>
CC: Wolfgang Denk <wd@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
11 years agolcd: remove unaligned access in lcd_dt_simplefb_configure_node()
Stephen Warren [Thu, 13 Jun 2013 23:13:11 +0000 (17:13 -0600)]
lcd: remove unaligned access in lcd_dt_simplefb_configure_node()

Some ARM compilers may emit code that makes unaligned accesses when
faced with constructs such as:

const char format[] = "r5g6b5";

Make this data static since it doesn't chagne; the compiler will simply
place it into the .rodata section directly, and avoid any unaligned run-
time initialization.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
11 years agodrivers:video:s6e8ax0: change data_to_send array to static
Piotr Wilczek [Fri, 24 May 2013 07:43:46 +0000 (09:43 +0200)]
drivers:video:s6e8ax0: change data_to_send array to static

This patch change 'data_to_send' array to static to avoid
unaligned access exeption on some platforms (ex Trats2).

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
CC: Anatolij Gustschin <agust@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Tom Rini [Mon, 1 Jul 2013 14:11:56 +0000 (10:11 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

11 years agousb: add support for the USB Ethernet adapter D-Link DUB-E100 H/W Ver C1
Pierre Aubert [Thu, 27 Jun 2013 07:01:54 +0000 (09:01 +0200)]
usb: add support for the USB Ethernet adapter D-Link DUB-E100 H/W Ver C1

This trivial patch adds the definition of the vid/pid for the Ver C1 of the
USB Ethernet adapter D-Link DUB-E100.

Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
CC: Marek Vasut <marex@denx.de>
11 years agousb: fix unaligned access in device_qual()
Heiko Schocher [Thu, 27 Jun 2013 08:04:57 +0000 (10:04 +0200)]
usb: fix unaligned access in device_qual()

while playing with dfu, I tapped in an unaligned access
when doing on the host side a "lsusb -d [vendornr]: -v"
I get on the board:

GADGET DRIVER: usb_dnl_dfu
data abort

    MAYBE you should read doc/README.arm-unaligned-accesses

pc : [<8ff71db8>]          lr : [<8ff75aec>]
sp : 8ef40d18  ip : 00000005     fp : 00000000
r10: 00000000  r9 : 47401410     r8 : 8ef40f38
r7 : 8ef4aae8  r6 : 0000000a     r5 : 8ef4ab28  r4 : 8ef4ab80
r3 : 0000000a  r2 : 00000006     r1 : 00000006  r0 : 8ef4aae8
Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32
Resetting CPU ...

reason is that in the "struct usb_composite_dev" the
"struct usb_device_descriptor desc;" is on an odd address,
and this struct gets accessed in
drivers/usb/gadget/composite.c device_qual()

Fix it, by align this var "struct desc" fix to an aligned
address.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Samuel Egli <samuel.egli@siemens.com>
11 years agodfu:function: Fix number of allocated DFU function pointers
Lukasz Majewski [Wed, 26 Jun 2013 09:46:13 +0000 (11:46 +0200)]
dfu:function: Fix number of allocated DFU function pointers

This subtle change fix problem with too small amount of allocated
memory to store DFU function pointers.

One needs to allocate extra space for sentinel NULL pointer in this array
of function pointers.

With the previous code, the NULL value overwrites malloc internal data
and afterwards free(f_dfu->function) crashes.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
11 years agousb, musb-new: add wdt trigger
Heiko Schocher [Tue, 4 Jun 2013 09:10:01 +0000 (11:10 +0200)]
usb, musb-new: add wdt trigger

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
11 years agousb, g_dnl: make possibility to fixup the device_desc board specific
Heiko Schocher [Tue, 4 Jun 2013 09:19:50 +0000 (11:19 +0200)]
usb, g_dnl: make possibility to fixup the device_desc board specific

add a weak dummy function g_dnl_fixup to add the possibility to update
the device_desc board specific. Used on the upcoming siemens board
support, where idVendor and idProduct is stored in an eeprom.

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>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agousb, dfu gadget: switch to dfu mode in dfu_bind
Heiko Schocher [Tue, 25 Jun 2013 11:59:29 +0000 (13:59 +0200)]
usb, dfu gadget: switch to dfu mode in dfu_bind

- set in to_dfu_mode() f_dfu->dfu_state = DFU_STATE_dfuIDLE
  as after every to_dfu_mode call this is done, so move
  this into to_dfu_mode
- switch in dfu_bind() into dfu mode:
  This fixes wrong "dfu-util -l" output, when calling
  "dfu-util -l" after a board reset, without doing a
  download before. See also discussion here:

http://lists.denx.de/pipermail/u-boot/2013-June/157272.html

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@ti.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Samuel Egli <samuel.egli@siemens.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
11 years agousb:composite: use memcpy to avoid unaligned access
Piotr Wilczek [Wed, 10 Apr 2013 12:07:51 +0000 (14:07 +0200)]
usb:composite: use memcpy to avoid unaligned access

This patch memcpy is used instead of an assignment to
avoid unaligned access execption on some ARM platforms.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agodrivers:usb: use get|put_unaligned_le16
Piotr Wilczek [Wed, 26 Jun 2013 06:22:05 +0000 (08:22 +0200)]
drivers:usb: use get|put_unaligned_le16

This patch use get|put_unaligned_le16 to access structure data
to avoid data abort on some ARM platforms.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Marek Vasut <marex@denx.de>
11 years agodfu: make data buffer size configurable
Heiko Schocher [Wed, 12 Jun 2013 04:05:51 +0000 (06:05 +0200)]
dfu: make data buffer size configurable

Dfu transfer uses a buffer before writing data to the
raw storage device. Make the size (in bytes) of this buffer
configurable through environment variable "dfu_bufsiz".
Defaut value is configurable through CONFIG_SYS_DFU_DATA_BUF_SIZE

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Tom Rini <trini@ti.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Tom Rini <trini@ti.com>
11 years agoPrepare v2013.07-rc2 v2013.07-rc2
Tom Rini [Fri, 28 Jun 2013 22:03:51 +0000 (18:03 -0400)]
Prepare v2013.07-rc2

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoFix bootm to work on powerpc again (compressed uImage)
Stefan Roese [Fri, 28 Jun 2013 08:02:03 +0000 (10:02 +0200)]
Fix bootm to work on powerpc again (compressed uImage)

Patch 35fc84fa1 [Refactor the bootm command to reduce code duplication]
breaks booting Linux (compressed uImage with fdt) on powerpc.

boot_jump_linux() mustn't be called before boot_prep_linux() and
boot_body_linux() have been called. So remove the superfluous call
to boot_jump_linux() in arch/powerpc/lib/bootm.c as its called later on
in this function.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
11 years agomkimage: Build signing only if board has CONFIG_FIT_SIGNATURE
Simon Glass [Thu, 27 Jun 2013 17:43:18 +0000 (10:43 -0700)]
mkimage: Build signing only if board has CONFIG_FIT_SIGNATURE

At present mkimage is set up to always build with image signing support.
This means that the SSL libraries (e.g. libssl-dev) are always required.

Adjust things so that mkimage can be built with and without image signing,
controlled by the presence of CONFIG_FIT_SIGNATURE in the board config file.

If CONFIG_FIT_SIGNATURE is not enabled, then mkimage will report a warning
that signing is not supported. If the option is enabled, but libraries are
not available, then a build error similar to this will be shown:

lib/rsa/rsa-sign.c:26:25: fatal error: openssl/rsa.h: No such file or directory

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: Disable interrupts before loading OS
Simon Glass [Fri, 28 Jun 2013 07:46:12 +0000 (00:46 -0700)]
bootm: Disable interrupts before loading OS

This restores the ordering of interrupt disable to what it what before
commit 35fc84fa. It seems that on some archiectures (e.g. PowerPC) the
OS is loaded into an interrupt region, which can cause problems if
interrupts are still running.

Tested-by: Stefan Roese <sr@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agocmd_bootm.c: Correct BOOTM_ERR_OVERLAP handling
Tom Rini [Fri, 28 Jun 2013 15:38:02 +0000 (11:38 -0400)]
cmd_bootm.c: Correct BOOTM_ERR_OVERLAP handling

With 35fc84fa1 [Refactor the bootm command to reduce code duplication]
we stopped checking the return value of bootm_load_os (unintentionally!)
and simply returned if we had a non-zero return value from the function.
This broke the valid case of a legacy image file of a single kernel
loaded into an overlapping memory area (the default way of booting
nearly all TI platforms).

The best way to fix this problem in the new code is to make
bootm_load_os be the one to see if we have a problem with this, and if
it's fatal return BOOTM_ERR_RESET and if it's not BOOTM_ERR_OVERLAP, so
that we can avoid calling lmb_reserve() but continue with booting.  We
however still need to handle the other BOOTM_ERR values so re-work
do_bootm_states so that we have an error handler at the bottom we can
goto for problems from bootm_load_os, or problems from the other callers
(as the code was before).  Add a comment to do_bootm_states noting the
existing restriction on negative return values.

Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v2:
- Rework so that only bootm_load_os and boot_selected_os head down into
  the err case code, and other errors simply return back to the caller.
  Fixes 'spl export'.

11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Fri, 28 Jun 2013 15:51:13 +0000 (17:51 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agovf610twr: Remove SoC name from U-Boot prompt
Otavio Salvador [Fri, 28 Jun 2013 12:53:00 +0000 (09:53 -0300)]
vf610twr: Remove SoC name from U-Boot prompt

We've been dropping SoC name from U-Boot prompt as it increase
complexity for automatic testing and makes line longer for no good
reason.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Andy Voltz <andy.voltz@timesys.com>
11 years agovf610twr: Add default environment in line with other Freescale boards
Otavio Salvador [Fri, 28 Jun 2013 12:52:59 +0000 (09:52 -0300)]
vf610twr: Add default environment in line with other Freescale boards

This adds a default environment which should be able to support both
3.0.15 from Timesys and upcoming 3.11.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Andy Voltz <andy.voltz@timesys.com>
11 years agovideo: mxsfb: Break the line in videomode message
Fabio Estevam [Wed, 26 Jun 2013 19:08:13 +0000 (16:08 -0300)]
video: mxsfb: Break the line in videomode message

Currently we have the following on boot:

CPU:   Freescale i.MX28 rev1.2 at 454 MHz
BOOT:  SSP SD/MMC #0, 3V3
DRAM:  128 MiB
MMC:   MXS MMC: 0
Video: MXSFB: 'videomode' variable not set!In:    serial

Break the line of the warning message in order to have a better reading format.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoMAINTAINERS: Add an entry to the mx6q wandboard variant
Fabio Estevam [Wed, 26 Jun 2013 16:53:45 +0000 (13:53 -0300)]
MAINTAINERS: Add an entry to the mx6q wandboard variant

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agoSMDK5250: Remove reduntant code
Rajeshwari Shinde [Tue, 25 Jun 2013 13:47:06 +0000 (19:17 +0530)]
SMDK5250: Remove reduntant code

enum boot_mode is defined twice once in spl.h and also in
spl_boot.c, hence removing the same from spl_boot.c and including
the header file.

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoam335x_evm: Add missing ';' in findfdt
Tom Rini [Thu, 27 Jun 2013 13:55:39 +0000 (09:55 -0400)]
am335x_evm: Add missing ';' in findfdt

In a714321 we add a check at the end of findfdt to make sure we have
updated it from undefined and if not, warn the user.  This however
forgot a ';' on the end of the previous last test.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-74xx-7xx
Tom Rini [Thu, 27 Jun 2013 12:23:27 +0000 (08:23 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-74xx-7xx

11 years agoPPC 74xx_7xx: Fix build warnings for ELPPC board
Wolfgang Denk [Fri, 14 Jun 2013 08:20:44 +0000 (10:20 +0200)]
PPC 74xx_7xx: Fix build warnings for ELPPC board

Fix:

misc.c: In function 'misc_init_r':
misc.c:210:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
misc.c:211:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]
misc.c:212:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoColdFire: Update the arch_global_date changes for mcf5441x
Jason Jin [Wed, 26 Jun 2013 02:21:31 +0000 (10:21 +0800)]
ColdFire: Update the arch_global_date changes for mcf5441x

Update inp_clk, vco_clk and flb_clk for mcf5441x as those
items were moved to arch_global_data.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>