]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
11 years agoarm: start.S: Fix _TEXT_BASE for SPL
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:42 +0000 (09:35 +0000)]
arm: start.S: Fix _TEXT_BASE for SPL

_TEXT_BASE must be set to CONFIG_SPL_TEXT_BASE for generic SPL, and to
CONFIG_SYS_TEXT_BASE for non-SPL builds.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agonand: mxc: Use appropriate page number in syndrome functions
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:41 +0000 (09:35 +0000)]
nand: mxc: Use appropriate page number in syndrome functions

The syndrome functions should use the page number passed as argument instead of
the page number saved upon NAND_CMD_READ0.

This does not make any difference if the NAND_NO_AUTOINCR option is set, but
otherwise this fixes accesses to the wrong pages.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
11 years agonand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome()
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:40 +0000 (09:35 +0000)]
nand: mxc: Fix debug trace in mxc_nand_read_oob_syndrome()

The page number indicated in the debug trace of mxc_nand_read_oob_syndrome() did
not match the page being worked on.

By the way, replace the GCC-specific __FUNCTION__ with __func__.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
11 years agoimx: mx53ard: Add support for NAND Flash
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:39 +0000 (09:35 +0000)]
imx: mx53ard: Add support for NAND Flash

Add support for the Samsung K9LAG08U0M NAND Flash (2-GiB MLC NAND Flash, 2-kiB
pages, 256-kiB blocks, 30-ns R/W cycles, 1 CS) on mx53ard.

eNFC_CLK_ROOT is set up with a cycle time of 37.5 ns (400 MHz / 3 / 5) for this
board, which satisfies the 30-ns NF R/W cycle requirement.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoimx: mx5: lowlevel_init: Simplify code
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:38 +0000 (09:35 +0000)]
imx: mx5: lowlevel_init: Simplify code

Don't use several instructions to build constant values.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agonand: mxc: Add support for i.MX5
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:37 +0000 (09:35 +0000)]
nand: mxc: Add support for i.MX5

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agonand: mxc: Prepare to add support for i.MX5
Benoît Thébaudeau [Thu, 11 Apr 2013 09:35:36 +0000 (09:35 +0000)]
nand: mxc: Prepare to add support for i.MX5

Add some abstraction to NFC definitions so that some parts of the current code
can also be used for future i.MX5 code.

Clean up a few things by the way.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomtd: nand: mxc_nand: Fix is_16bit_nand()
Fabio Estevam [Thu, 11 Apr 2013 09:35:35 +0000 (09:35 +0000)]
mtd: nand: mxc_nand: Fix is_16bit_nand()

Currently is_16bit_nand() is a per SoC function and it decides the bus nand
width by reading some boot related registers.

This method works when NAND is the boot medium, but does not work if another
boot medium is used. For example: booting from a SD card and then using NAND
to store the environment variables, would lead to the following error:

NAND bus width 16 instead 8 bit
No NAND device found!!!
0 MiB

Use CONFIG_SYS_NAND_BUSWIDTH_16BIT symbol to decide the bus width.

If it is defined in the board file, then consider 16-bit NAND bus-width,
otherwise assume 8-bit NAND is used.

This also aligns with Documentation/devicetree/bindings/mtd/nand.txt, which
states:

nand-bus-width : 8 or 16 bus width if not present 8

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
11 years agomtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT
Fabio Estevam [Thu, 11 Apr 2013 09:35:34 +0000 (09:35 +0000)]
mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT

Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller
drivers could use it when a 16-bit NAND is deployed.

drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
other NAND drivers could reuse the same symbol.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
11 years agoenv: Add redundant env support to UBI env
Joe Hershberger [Mon, 8 Apr 2013 10:32:52 +0000 (10:32 +0000)]
env: Add redundant env support to UBI env

Allow the user to specify two UBI volumes to use for the environment

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoenv: Add support for UBI environment
Joe Hershberger [Mon, 8 Apr 2013 10:32:51 +0000 (10:32 +0000)]
env: Add support for UBI environment

UBI is a better place for the environment on NAND devices because it
handles wear-leveling and bad blocks.

Gluebi is needed in Linux to access the env as an MTD partition.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agomtd: Make mtdparts work with pre-reloc env
Joe Hershberger [Mon, 8 Apr 2013 10:32:50 +0000 (10:32 +0000)]
mtd: Make mtdparts work with pre-reloc env

The env in UBI needs to look up the mtd partition as part of relocation,
which happens before relocation.  Make the mtdparts code capable of
working on the default env to start with.

The code tries to set values in the env as well, but again, the env
isn't there yet, so add a check to setenv to not allow sets before the
env is relocated.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoubi: ubifs: Turn off verbose prints
Joe Hershberger [Mon, 8 Apr 2013 10:32:49 +0000 (10:32 +0000)]
ubi: ubifs: Turn off verbose prints

The prints are out of control.  SILENCE!

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoubi: ubifs: Add documentation for README
Joe Hershberger [Mon, 8 Apr 2013 10:32:48 +0000 (10:32 +0000)]
ubi: ubifs: Add documentation for README

Describe the needed CONFIG tokens to enable UBI and UBIFS support.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoubi: Expose a few simple functions from the cmd_ubi
Joe Hershberger [Mon, 8 Apr 2013 10:32:47 +0000 (10:32 +0000)]
ubi: Expose a few simple functions from the cmd_ubi

Part, Read, and Write functionality that will be used by env_ubi.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoubi: Fix broken cleanup code in attach_by_scanning
Joe Hershberger [Mon, 8 Apr 2013 10:32:46 +0000 (10:32 +0000)]
ubi: Fix broken cleanup code in attach_by_scanning

The unwind code was not reversing operations correctly and was causing
a hang on any error condition.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
11 years agoDo not call board_early_init_f() twice
Vadim Bendebury [Tue, 9 Apr 2013 14:06:51 +0000 (14:06 +0000)]
Do not call board_early_init_f() twice

Apparently due to a missed rebase conflict resolution
board_early_init_f() is included twice in the list of initialization
functions.

Leave only the first occurrence.
   . built and boot an Exynos 5250 target

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Tom Rini [Thu, 11 Apr 2013 18:31:50 +0000 (14:31 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

11 years agoomap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
Jon Hunter [Tue, 9 Apr 2013 21:41:33 +0000 (16:41 -0500)]
omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ

The function get_timer() should return time in ms and CONFIG_SYS_HZ
should be set to 1000 by default. Fix both of these items.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap5912-osk: Increase flash partition for u-boot
Jon Hunter [Tue, 9 Apr 2013 21:41:32 +0000 (16:41 -0500)]
omap5912-osk: Increase flash partition for u-boot

The current u-boot binary needs more than 128KB of flash space and so
move the u-boot environment from an offset of 128KB to 256KB in flash
to ensure the enviroment does not overlap with u-boot.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap5912-osk: Fix device initialisation
Jon Hunter [Tue, 9 Apr 2013 21:41:31 +0000 (16:41 -0500)]
omap5912-osk: Fix device initialisation

In the current u-boot, the device pin multiplexing and clock
initialisation needs to be early during the boot process and before
board_init() is called. U-boot is currently crashing on this board
because this is not being done early enough. Therefore, add a s_init()
function for the omap5912-osk board to do this.

Also fix the stack pointer so that it is pointing to the end of the
internal RAM and not the beginning as this was also causing the device
to crash.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap5912-osk: Fix booting from NOR flash
Jon Hunter [Tue, 9 Apr 2013 21:41:30 +0000 (16:41 -0500)]
omap5912-osk: Fix booting from NOR flash

The omap5912-osk board is using a RAM based address as the linker
location for code. This is causing several problems when attempting
to run the latest u-boot code base on this board from flash. Update
the default linker location for code to be in NOR flash at address
0x00000000.

The omap5912-osk board only has 32MB of RAM and so fix the comment
in the omap5912-osk config.mk file as well.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap5912-osk: Fix DRAM initialisation
Jon Hunter [Tue, 9 Apr 2013 21:41:29 +0000 (16:41 -0500)]
omap5912-osk: Fix DRAM initialisation

The size of the DRAM for the omap5912-osk board is getting setup in the
dram_init() function. However, for the current u-boot release this is
too late and needs to be done in dram_init_banksize(). Therefore, add
a dram_init_banksize() function for the omap5912-osk board and setup the
DRAM size there.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap5_uevm: Correct to 2MiB aligned partitions on eMMC
Tom Rini [Wed, 10 Apr 2013 19:10:10 +0000 (15:10 -0400)]
omap5_uevm: Correct to 2MiB aligned partitions on eMMC

This has a 2MiB erase block size eMMC, so make sure we align on that for
best possible performance.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoOMAP4: Fix bug in omap4460_volts struct
Lubomir Popov [Mon, 8 Apr 2013 22:05:33 +0000 (22:05 +0000)]
OMAP4: Fix bug in omap4460_volts struct

The omap4460_volts struct was incorrectly referencing tps62361
instead of twl6030 as PMIC for the core and mm voltages (the
tps is used for mpu supply only). This shall lead to bad OPP
settings while booting kernel. Fixing it.

Fix some comments as well.

Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
11 years agopowerpc/lib: fix unsafe register handling in wait_ticks
Mats Kärrman [Tue, 9 Apr 2013 15:10:59 +0000 (17:10 +0200)]
powerpc/lib: fix unsafe register handling in wait_ticks

If watchdog is enabled, the arch/powerpc/lib/ticks.S::wait_ticks() function
calls the function specified by the WATCHDOG_RESET macro.
The wait_ticks function depends on the registers r0, r6 and r7 being
preserved however that is not guaranteed, e.g. if the reset function is a
C function this will probably overwrite r0 and cause an endless loop.

The following patch changes to using r14+r15 instead of r6+r7 (to resemble
what would have been generated by a C compiler) and saves all necessary
registers on the stack.

The patch has been tested on a custom MPC5125 based machine using the 512x
powerpc architecture.

Signed-off-by: Mats Karrman <mats.karrman@tritech.se>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Tested-by: Stefan Roese <sr@denx.de>
11 years agoam335x: Update timings for the beaglebone again
Tom Rini [Wed, 10 Apr 2013 13:10:54 +0000 (15:10 +0200)]
am335x: Update timings for the beaglebone again

After further testing we can run DDR at 400MHz so update the timings
again.

Tested-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agopowerpc/usb: Fix usb device-tree fix-up
ramneek mehresh [Sun, 17 Feb 2013 18:23:32 +0000 (18:23 +0000)]
powerpc/usb: Fix usb device-tree fix-up

Fix USB device-tree fixup to properly handle device-tree fixup and
print appropriate message when wrong/junk "dr_mode" or "phy_type"
are mentioned in hwconfig string

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
11 years agoam335x_evm: Enable DFU for NAND and MMC, provide example alt_infos
Pantelis Antoniou [Thu, 14 Mar 2013 05:32:55 +0000 (05:32 +0000)]
am335x_evm: Enable DFU for NAND and MMC, provide example alt_infos

- Add CONFIG_DFU_NAND, CONFIG_DFU_MMC
- Set dfu_alt_info_nand, dfu_alt_info_emmc and dfu_alt_info_mmc to show
  working examples for those cases.
- Increase CONFIG_SYS_MAXARGS due to hush parsing bugs that would
  otherwise disallow 'setenv dfu_alt_info ${dfu_alt_info_nand}'.
- Enable CONFIG_FAT_WRITE to allow updating on MMC

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Add CONFIG_CMD_MTDPARTS and relevant defaults
Tom Rini [Thu, 14 Mar 2013 05:32:54 +0000 (05:32 +0000)]
am335x_evm: Add CONFIG_CMD_MTDPARTS and relevant defaults

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Define CONFIG_SYS_CACHELINE_SIZE
Pantelis Antoniou [Thu, 14 Mar 2013 05:32:53 +0000 (05:32 +0000)]
am335x_evm: Define CONFIG_SYS_CACHELINE_SIZE

drivers/usb/gadget/composite.c requires that this is defined early.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Tom Rini <trini@ti.com>
11 years agodfu: NAND specific routines for DFU operation
Pantelis Antoniou [Thu, 14 Mar 2013 05:32:52 +0000 (05:32 +0000)]
dfu: NAND specific routines for DFU operation

Support for NAND storage devices to work with the DFU framework.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Scott Wood <scottwood@freescale.com>
11 years agocmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS
Tom Rini [Thu, 14 Mar 2013 05:32:51 +0000 (05:32 +0000)]
cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFS

The flag changed from WITH_INLINE_OOB to WITH_YAFFS_OOB by accident in
418396e.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agonand: Extend nand_(read|write)_skip_bad with *actual and limit parameters
Tom Rini [Thu, 14 Mar 2013 05:32:50 +0000 (05:32 +0000)]
nand: Extend nand_(read|write)_skip_bad with *actual and limit parameters

We make these two functions take a size_t pointer to how much space
was used on NAND to read or write the buffer (when reads/writes happen)
so that bad blocks can be accounted for.  We also make them take an
loff_t limit on how much data can be read or written.  This means that
we can now catch the case of when writing to a partition would exceed
the partition size due to bad blocks.  To do this we also need to make
check_skip_len count not just complete blocks used but partial ones as
well.  All callers of nand_(read|write)_skip_bad are adjusted to call
these with the most sensible limits available.

The changes were started by Pantelis and finished by Tom.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agodfu: Change indentation of defines in <dfu.h>
Tom Rini [Thu, 14 Mar 2013 05:32:49 +0000 (05:32 +0000)]
dfu: Change indentation of defines in <dfu.h>

Signed-off-by: Tom Rini <trini@ti.com>
11 years agodfu: Support larger than memory transfers.
Pantelis Antoniou [Thu, 14 Mar 2013 05:32:48 +0000 (05:32 +0000)]
dfu: Support larger than memory transfers.

Previously we didn't support upload/download larger than available
memory.  This is pretty bad when you have to update your root filesystem
for example.

This patch removes that limitation (and the crashes when you transfered
any file larger than 4MB) by making raw image writes be done in chunks
and making file maximum size be configurable.

The sequence number is a 16 bit counter; make sure we handle rollover
correctly. This fixes the wrong transfers for large (> 256MB) images.

Also utilize a variable to handle initialization, so that we don't rely
on just the counter sent by the host.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoREADME: Document current DFU CONFIG options
Tom Rini [Thu, 14 Mar 2013 05:32:47 +0000 (05:32 +0000)]
README: Document current DFU CONFIG options

Add documentation for the current DFU config options.  DFU is a standard
USB device class so more information is available from usb.org

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x/ti814x: Correct MMC_BOOT_DEVICES_START/END
Tom Rini [Tue, 9 Apr 2013 15:40:40 +0000 (11:40 -0400)]
am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END

Given that on TI814x we have MMC1/2 swapped, we also need to swap them
in MMC_BOOT_DEVICES_START/END

Reported-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agopatman: Add Series-process-log tag to sort/uniq change logs
Simon Glass [Tue, 26 Mar 2013 13:09:44 +0000 (13:09 +0000)]
patman: Add Series-process-log tag to sort/uniq change logs

For some series with lots of changes it is annoying that duplicate change
log items are not caught. It is also helpful sometimes to sort the change
logs.

Add a Series-process-log tag to enable this, which can be placed in a
commit to control this.

The change to the Cc: line is to fix a checkpatch warning.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Add -a option to refrain from test-applying the patches
Simon Glass [Tue, 26 Mar 2013 13:09:43 +0000 (13:09 +0000)]
patman: Add -a option to refrain from test-applying the patches

Especially with the Linux kernel, it takes a long time (a minute or more)
to test-apply the patches, so patman becomes significantly less useful.
The only real problem that is found with this apply step is trailing spaces.
Provide a -a option to skip this step, for those working with clean patches.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Don't barf if the word 'commit' starts a line
Doug Anderson [Fri, 1 Mar 2013 11:11:07 +0000 (11:11 +0000)]
patman: Don't barf if the word 'commit' starts a line

Patman's regular expression for detecting the start of a
commit in a git log was a little simplistic and could be
confused if the git log itself had the word "commit" as
the start of a line (as this commit does).  Make patman
a little more robust.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Provide option to ignore bad aliases
Simon Glass [Tue, 26 Mar 2013 13:09:42 +0000 (13:09 +0000)]
patman: Provide option to ignore bad aliases

Often it happens that patches include tags which don't have aliases. It
is annoying that patman fails in this case, and provides no option to
continue other than adding empty tags to the .patman file.

Correct this by adding a '-t' option to ignore tags that don't exist.
Print a warning instead.

Since running the tests is not a common operation, move this to --test
instead, to reserve -t for this new option.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agoMerge branch 'patman' of git://git.denx.de/u-boot-x86
Tom Rini [Mon, 8 Apr 2013 16:03:22 +0000 (12:03 -0400)]
Merge branch 'patman' of git://git.denx.de/u-boot-x86

11 years agocmd_sf: include header file common.h before div64.h
Mingkai Hu [Sun, 7 Apr 2013 22:13:32 +0000 (22:13 +0000)]
cmd_sf: include header file common.h before div64.h

The header file div64.h includes <asm/types.h> which defines
the phys_addr_t according to the macro CONFIG_PHYS_64BIT, while
the macro CONFIG_PHYS_64BIT is included in common.h which comes
after div64.h, so in order to get consistent type definition for
phys_addr_t, common.h should be included before div64.h, Or else,
the parameters of phys_addr_t type will be passed wrongly when
CONFIG_PHYS_64BIT is defined.

Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
11 years agocommon/cmd_test: Avoid macro expansion
York Sun [Thu, 4 Apr 2013 11:52:53 +0000 (11:52 +0000)]
common/cmd_test: Avoid macro expansion

cmd_test.c adds "true" and "false" as new commands. We need to avoid macro
expansion for U_BOOT_CMD.

Signed-off-by: York Sun <yorksun@freescale.com>
11 years agodfu: Increase DFU buffer size from 4MiB to 8MiB
Łukasz Majewski [Thu, 4 Apr 2013 04:32:58 +0000 (04:32 +0000)]
dfu: Increase DFU buffer size from 4MiB to 8MiB

Increase size of DMA buffer from 4MiB to 8MiB. This is necessary due to
uImage size increase.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agodfu:ext4:fix: Change ext4write command order of parameters
Łukasz Majewski [Thu, 4 Apr 2013 04:32:57 +0000 (04:32 +0000)]
dfu:ext4:fix: Change ext4write command order of parameters

Following commit:
"cmd_ext4: BREAK and correct ext4write parameter order"
SHA1:0171d52c410cbaa9290b1b214e695697c835bfe5

introduced cleanup of ext4write semantics to be consistent with other
filesystem's writing commands (e.g. fatwrite).
This commit provides correct ext4write command generation at DFU eMMC
code.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
11 years agoomap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE
Tom Rini [Fri, 5 Apr 2013 06:21:46 +0000 (06:21 +0000)]
omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE

Cc: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoomap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h
Tom Rini [Fri, 5 Apr 2013 06:21:45 +0000 (06:21 +0000)]
omap5_uevm.h: Move uEVM-specific choices to omap5_uevm.h

The omap5_uevm platform has eMMC, and it makes sense to say that our
default env storage shall reside there.  Other platforms may not, so
move this choice to the EVM config.  In addition, we should provide some
way to partition the flash for later usage, so take advantage of the GPT
partition table support code and allow that to be setup with some
reasonable defaults.

Cc: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoOMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC
Tom Rini [Fri, 5 Apr 2013 06:21:44 +0000 (06:21 +0000)]
OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

In the case of booting from certain peripherals, such as UART, we must
not see what the device descriptor says for RAW or FAT mode because in
addition to being nonsensical, it leads to a hang.  This is why we have
a test currently for the boot mode being within range.  The problem
however is that on some platforms we get MMC2_2 as the boot mode and not
the defined value for MMC2, and in others we get the value for MMC2_2.
This is required to fix eMMC booting on omap5_uevm.

Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on
classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoarm: omap4: Fix SDRAM AUTO DETECTION
Lokesh Vutla [Thu, 4 Apr 2013 19:51:14 +0000 (19:51 +0000)]
arm: omap4: Fix SDRAM AUTO DETECTION

Commit "8602114 omap: emif: configure emif only when required"
breaks SDRAM_AUTO_DETECTION.
The issue is dmm_init() depends on emif_sizes[](SDRAM Auto detection)
done in do_sdram_init(). The above commit moves dmm_init() above
do_sdram_init() because of which dmm_init() uses uninitialized
emif_sizes[].
So instead of using global emif_sizes[], get sdram details locally
and calculate emif sizes.

Reported-by: Michael Cashwell <mboards@prograde.net>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoOMAP: Fix copy-paste bug that did not enable UART4 clock
Lubomir Popov [Thu, 4 Apr 2013 05:51:45 +0000 (05:51 +0000)]
OMAP: Fix copy-paste bug that did not enable UART4 clock

V2 fixes line wrap issue of the patch itself.

UART3 was enabled twice instead of UART4.

One more cosmetic change in a comment on EMIF clock.

Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
Reviewed-by: R Sricharan <r.sricharan@ti.com>
11 years agodoc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL
Tom Rini [Tue, 2 Apr 2013 07:39:43 +0000 (07:39 +0000)]
doc/feature-removal-schedule.txt: Add CONFIG_SYS_(CLOCKS|PADS)_ENABLE_ALL

We shall remove these OMAP4/5-specific options in v2013.07, barring
insufficient progress on the kernel side.

Cc: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoARM: OMAP4/5: Make bootz as the default boot command
SRICHARAN R [Thu, 4 Apr 2013 23:39:47 +0000 (23:39 +0000)]
ARM: OMAP4/5: Make bootz as the default boot command

So with OMAP added to multi platform kernel,
the uImage no more contains a valid load address.
With the uboot already supporting zImage,
change the default boot command to bootz
instead.

Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
11 years agoARM: OMAP4/5: Change the default boot command to work with device tree
SRICHARAN R [Thu, 4 Apr 2013 23:39:27 +0000 (23:39 +0000)]
ARM: OMAP4/5: Change the default boot command to work with device tree

Now with kernel moving to all device tree, the default
boot command is changed to pass the device tree blob.
Also, adding the findfdt command to get the dt-blob
based on the board.

Thanks to Tom Rini <trini@ti.com> for suggesting this.

Signed-off-by: Sricharan R <r.sricharan@ti.com>
11 years agoomap5: Allow use of a plain text env file
Nishanth Menon [Mon, 1 Apr 2013 05:52:40 +0000 (05:52 +0000)]
omap5: Allow use of a plain text env file

For production systems it is better to use script images since
they are protected by checksums and carry valuable information
like name and timestamp. Also, you can't validate the content
passed to env import.

But for development, it is easier to use the env import command and
plain text files instead of script-images.

Since both OMAP5evm/uevm boards are used primarily for development,
we allow U-Boot to load env var from a text file in case that an
boot.scr script-image is not present.

The variable uenvcmd (if existent) will be executed (using run) after
uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence
will be started.

Inspired by commit: d70f54808dfa83b574e1239c3eccbcf3317343e1
(omap4: allow the use of a plain text env file instead boot scripts)

Signed-off-by: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Sricharan R <r.sricharan@ti.com>
11 years agoARM: OMAP5: Set fdt_high to enable booting with Device tree
SRICHARAN R [Mon, 1 Apr 2013 05:52:39 +0000 (05:52 +0000)]
ARM: OMAP5: Set fdt_high to enable booting with Device tree

While booting with dt blob, if fdt_high is not set to
0xffffffff, the dt blob gets relocated to a high ram address,
which the kernel is not able to use without HIGHMEM.

So set it to 0xffffffff to avoid the issue.

Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
11 years agoARM: OMAP5: Rename omap5_evm to omap5_uevm
SRICHARAN R [Mon, 1 Apr 2013 05:52:38 +0000 (05:52 +0000)]
ARM: OMAP5: Rename omap5_evm to omap5_uevm

The omap5-uevm is the reference board name for OMAP5 soc
based platform. So rename it accordingly.

Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
11 years agoomap2420-h4: Fix get_timer() and CONFIG_SYS_HZ
Hunter, Jon [Wed, 3 Apr 2013 09:35:36 +0000 (09:35 +0000)]
omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ

The function get_timer() should return time in ms and CONFIG_SYS_HZ
should be set to 1000 by default. Fix both of these items.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap2420-h4: Add device tree support
Hunter, Jon [Wed, 3 Apr 2013 09:35:35 +0000 (09:35 +0000)]
omap2420-h4: Add device tree support

Enable device-tree support for the omap2420-h4 board.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap2420-h4: Fix booting from NOR flash
Hunter, Jon [Wed, 3 Apr 2013 09:35:34 +0000 (09:35 +0000)]
omap2420-h4: Fix booting from NOR flash

The omap2420-h4 board is using a RAM based address as the linker
location for code. This is causing several problems when attempting
to run the latest u-boot code base on this board from flash. Update
the default linker location for code to be in NOR flash. Please note
that OMAP maps the NOR flash to address 0x08000000 by default and so
use this as the default address for the NOR flash.

Also remove legacy code that attempts to calculate where in flash the
sdata structure, that holds the memory interface configuration data,
is located. By changing the default linker location for code to flash
this is no longer necessary.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agoomap2420-h4: Fix DRAM initialisation
Hunter, Jon [Wed, 3 Apr 2013 09:35:33 +0000 (09:35 +0000)]
omap2420-h4: Fix DRAM initialisation

The size of the DRAM for the omap2420-h4 board is getting setup in the
dram_init() function. However, for the current u-boot release this is
too late and needs to be done in dram_init_banksize(). Therefore, add
a dram_init_banksize() function for the omap2420-h4 board and setup the
DRAM size there.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
11 years agotricorder: enable hw assisted BCH8 in SPL and u-boot
Andreas Bießmann [Tue, 2 Apr 2013 06:05:58 +0000 (06:05 +0000)]
tricorder: enable hw assisted BCH8 in SPL and u-boot

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Thomas Weber <weber@corscience.de>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
Cc: Scott Wood <scottwood@freescale.com>
11 years agoomap_gpmc: add support for hw assisted BCH8
Andreas Bießmann [Fri, 5 Apr 2013 04:55:21 +0000 (04:55 +0000)]
omap_gpmc: add support for hw assisted BCH8

The kernel states:

---8<---
The OMAP3 GPMC hardware BCH engine computes remainder polynomials, it does not
provide automatic error location and correction: this step is implemented using
the BCH library.
--->8---

And we do so in u-boot.

This implementation uses the same layout for BCH8 but it is fix. The current
provided layout does only work with 64 Byte OOB.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Mansoor Ahamed <mansoor.ahamed@ti.com>
Cc: Thomas Weber <thomas.weber.linux@googlemail.com>
11 years agoomap_gpmc: change nandecc command
Andreas Bießmann [Thu, 4 Apr 2013 23:52:50 +0000 (23:52 +0000)]
omap_gpmc: change nandecc command

With uppcoming BCH support on OMAP devices we need to decide between differnt
algorithms when switching the ECC engine.  Currently we support 1-bit hammign
and 8-bit BCH on HW backend.

In order to switch between differnet ECC algorithms we need to change the
interface of omap_nand_switch_ecc() also.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Thomas Weber <thomas.weber.linux@googlemail.com>
11 years agoomap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel
Andreas Bießmann [Tue, 2 Apr 2013 06:05:55 +0000 (06:05 +0000)]
omap3/omap_gpmc.h: add ooblayout for BCH8 as in kernel

This patch adds BCH8 ooblayout for NAND as provided by
0e618ef0a6a33cf7ef96c2c824402088dd8ef48c in linux kernel. This Layout is
currently only provided for 64 byte OOB.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
Cc: Scott Wood <scottwood@freescale.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoasm/omap_gpmc.h: consolidate common defines
Andreas Bießmann [Tue, 2 Apr 2013 06:05:54 +0000 (06:05 +0000)]
asm/omap_gpmc.h: consolidate common defines

arch/arm/include/asm/arch-am33xx/omap_gpmc.h and
arch/arm/include/asm/arch-omap3/omap_gpmc.h are almost the same, consolidate
the common parts into a new header.

Introduce a new asm/omap_gpmc.h which defines the command part and pulls in
the architecture specific one.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoomap3/cpu.h: add BCH support
Andreas Bießmann [Tue, 2 Apr 2013 06:05:53 +0000 (06:05 +0000)]
omap3/cpu.h: add BCH support

This patch adds the BCH result registers to register mapping for OMAP3 gpmc.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Ilya Yanok <ilya.yanok@cogentembedded.com>
Cc: Scott Wood <scottwood@freescale.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoomap3_beagle: Flush UART3 xmit on enable if TEMT is broken
Manfred Huber [Fri, 29 Mar 2013 02:52:36 +0000 (02:52 +0000)]
omap3_beagle: Flush UART3 xmit on enable if TEMT is broken

Flush UART3 xmit on enable if TEMT is broken

On some OMAP3 devices when UART3 is configured for boot mode before SPL starts
only THRE bit is set. We have to empty the transmitter before initialization
starts. This patch avoids the use of CONFIG_SYS_NS16550_BROKEN_TEMT.

Signed-off-by: Manfred Huber <man.huber@arcor.de>
Tested-by: Javier Martinez Canillas <javier@dowhile0.org>
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoam335x: Enable MMC1 clock
Tom Rini [Wed, 3 Apr 2013 08:50:01 +0000 (08:50 +0000)]
am335x: Enable MMC1 clock

We must not assume ROM has enabled the clock for MMC1.

Reported-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
11 years agopcm051: Enable DDR PHY dynamic power down bit
Lars Poeschel [Wed, 3 Apr 2013 04:37:52 +0000 (04:37 +0000)]
pcm051: Enable DDR PHY dynamic power down bit

This is done already for am335x in
59dcf970d11ebff5d9f4bbbde79fda584e9e7ad4 and also applies for pcm051.

It powers down the IO receiver when not performing read which helps
reducing the overall power consuption in low power states
(suspend/standby).

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
11 years agomusb: set MUSB speed based on CONFIG
Bin Liu [Thu, 21 Mar 2013 05:27:49 +0000 (05:27 +0000)]
musb: set MUSB speed based on CONFIG

Do not config MUSB to highspeed mode if CONFIG_USB_GADGET_DUALSPEED
is not set, in which case Ether gadget only operates in fullspeed.

Reviewed-by: Tom Rini <trini@ti.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
11 years agomusb: am335x: disable bulk split-combine feature
Bin Liu [Thu, 21 Mar 2013 05:27:48 +0000 (05:27 +0000)]
musb: am335x: disable bulk split-combine feature

On TI AM335x devices, MUSB has bulk split/combine feature enabled
in the ConfigData register, but the current MUSB driver does not
support it yet. Therefore, disable the feature for now, until the
driver adds the support.

One usecase which is broken because of this feature is that Ether
gadget stops working in Fullspeed mode (by un-defining
CONFIG_USB_GADGET_DUALSPEED)

After desabled this feature, MUSB driver send packets in proper size
(no more than 64 bytes) in Fullspeed mode.

This has been validated with Ether gadget in Fullspeed mode on AM335x
EVM.

Signed-off-by: Bin Liu <b-liu@ti.com>
11 years agologo: update to the new logo for ATMEL
Josh Wu [Thu, 28 Mar 2013 10:37:49 +0000 (18:37 +0800)]
logo: update to the new logo for ATMEL

Atmel change to new logo since 2012. This patch update the logo to new one.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoRevert "env: fix potential stack overflow in environment functions"
Tom Rini [Fri, 5 Apr 2013 18:55:21 +0000 (14:55 -0400)]
Revert "env: fix potential stack overflow in environment functions"

Wolfgang requested this be reverted and Rob agreed after further
discussion.  This was a symptom of a larger problem we need to deal
with.

This reverts commit 60d7d5a63189c9f77a190c9965861dc15482c2d0.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agobuildman - U-Boot multi-threaded builder and summary tool
Simon Glass [Wed, 3 Apr 2013 11:07:16 +0000 (11:07 +0000)]
buildman - U-Boot multi-threaded builder and summary tool

This tool handles building U-Boot to check that you have not broken it
with your patch series. It can build each individual commit and report
which boards fail on which commits, and which errors come up. It also
shows differences in image sizes due to particular commits.

Buildman aims to make full use of multi-processor machines.

Documentation and caveats are in tools/buildman/README.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Ignore all Gerrit Commit-* tags
Simon Glass [Wed, 3 Apr 2013 11:01:39 +0000 (11:01 +0000)]
patman: Ignore all Gerrit Commit-* tags

These tags are used by Gerrit, so let's ignore all of them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Minor help message/README fixes
Simon Glass [Tue, 26 Mar 2013 13:09:45 +0000 (13:09 +0000)]
patman: Minor help message/README fixes

A few of the help messages are not quite right, and there is a typo
in the README. Fix these.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Fix the comment in CheckTags to mention multiple tags
Simon Glass [Tue, 26 Mar 2013 13:09:41 +0000 (13:09 +0000)]
patman: Fix the comment in CheckTags to mention multiple tags

This comment is less than helpful. Since multiple tags are supported, add
an example of how multiple tags work.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Don't allow spaces in tags
Simon Glass [Tue, 26 Mar 2013 13:09:40 +0000 (13:09 +0000)]
patman: Don't allow spaces in tags

At present something like:

   Revert "arm: Add cache operations"

will try to use

   Revert "arm

as a tag. Clearly this is wrong, so fix it.

If the revert is intended to be tagged, then the tag can come before
the revert, perhaps. Alternatively the 'Cc' tag can be used in the commit
messages.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Fix up checkpatch parsing to deal with 'CHECK' lines
Simon Glass [Tue, 26 Mar 2013 13:09:39 +0000 (13:09 +0000)]
patman: Fix up checkpatch parsing to deal with 'CHECK' lines

checkpatch has a new type of warning, a 'CHECK'. At present patman fails
with these, which makes it less than useful.

Add support for checks, making it backwards compatible with the old
checkpatch.

At the same time, clean up formatting of the CheckPatches() output,
fix erroneous "internal error" if multiple patches have warnings and
be more robust to new types of problems.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Add Cover-letter-cc tag to Cc cover letter to people
Simon Glass [Wed, 20 Mar 2013 16:43:00 +0000 (16:43 +0000)]
patman: Add Cover-letter-cc tag to Cc cover letter to people

The cover letter is sent to everyone who is on the Cc list for any of
the patches in the series. Sometimes it is useful to send just the cover
letter to additional people, so that they are aware of the series, but
don't need to wade through all the individual patches.

Add a new Cover-letter-cc tag for this purpose.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
11 years agopatman: Allow specifying the message ID your series is in reply to
Doug Anderson [Sun, 17 Mar 2013 10:31:04 +0000 (10:31 +0000)]
patman: Allow specifying the message ID your series is in reply to

Some versions of git don't seem to prompt you for the message ID that
your series is in reply to.  Allow specifying this from the command
line.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Make "Reviewed-by" an important tag
Doug Anderson [Fri, 15 Mar 2013 13:24:05 +0000 (13:24 +0000)]
patman: Make "Reviewed-by" an important tag

Although "Reviewed-by:" is a tag that gerrit adds, it's also a tag
used by upstream.  Stripping it is undesirable.  In fact, we should
treat it as important.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Add additional git utilties
Simon Glass [Sat, 15 Dec 2012 10:42:07 +0000 (10:42 +0000)]
patman: Add additional git utilties

Add methods to find out the commits in a branch, clone a repo and
fetch from a repo.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Allow reading metadata from a list of commits
Simon Glass [Sat, 15 Dec 2012 10:42:06 +0000 (10:42 +0000)]
patman: Allow reading metadata from a list of commits

We normally read from the current branch, but buildman will need to look
at commits from another branch. Allow the metadata to be read from any
list of commits, to provide this flexibility.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Allow commands to raise on error, or not
Simon Glass [Sat, 15 Dec 2012 10:42:05 +0000 (10:42 +0000)]
patman: Allow commands to raise on error, or not

Make raise_on_error a parameter so that we can control which commands
raise and which do not. If we get an error reading the alias file, just
continue.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Make command methods return a CommandResult
Simon Glass [Sat, 15 Dec 2012 10:42:04 +0000 (10:42 +0000)]
patman: Make command methods return a CommandResult

Rather than returning a list of things, return an object. That makes it
easier to access the returned items, and easier to extend the return
value later.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Add cros_subprocess library to manage subprocesses
Simon Glass [Sat, 15 Dec 2012 10:42:03 +0000 (10:42 +0000)]
patman: Add cros_subprocess library to manage subprocesses

This adds a new library on top of subprocess which permits access to
the subprocess output as it is being generated. We can therefore
give the illusion that a process is running independently, but still
monitor its output so that we know what is going on.

It is possible to display output on a terminal as it is generated
(a little like tee). The supplied output function is called with all
stdout/stderr data as it arrives.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Use bright ANSI colours by default
Simon Glass [Sat, 15 Dec 2012 10:42:02 +0000 (10:42 +0000)]
patman: Use bright ANSI colours by default

Rather than the rather dull colours, use bright versions which normally
look better and are easier to read.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agopatman: Use ANSI colours only when outputting to a terminal
Simon Glass [Sat, 15 Dec 2012 10:42:01 +0000 (10:42 +0000)]
patman: Use ANSI colours only when outputting to a terminal

It is easy to detect whether or not the process is connected to a terminal,
or piped to a file. Disable ANSI colours automatically when output is
not to a terminal.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Tom Rini [Thu, 4 Apr 2013 16:01:27 +0000 (12:01 -0400)]
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

11 years agoMerge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 4 Apr 2013 13:44:57 +0000 (15:44 +0200)]
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

11 years agoexynos: change indentation of defines in cpu.h
Minkyu Kang [Mon, 1 Apr 2013 19:22:40 +0000 (19:22 +0000)]
exynos: change indentation of defines in cpu.h

Fix the indentation of some defines by tab.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agospi: mxc_spi: Fix ECSPI reset handling
Dirk Behme [Wed, 20 Mar 2013 22:03:44 +0000 (22:03 +0000)]
spi: mxc_spi: Fix ECSPI reset handling

Reviewing the ECSPI reset handling shows two issues:

1. For the enable/reset bit (MXC_CSPICTRL_EN) in the control reg
   (ECSPIx_CONGREG) the i.MX6 technical reference manual states:

   -- cut --
   ECSPIx_CONREG[0]: EN: Writing zero to this bit disables the block
   and resets the internal logic with the exception of the ECSPI_CONREG.
   -- cut --

   Note the exception mentioned: The CONREG itself isn't reset.

   Fix this by manually writing the reset value 0 to the whole register.
   This sets the EN bit to zero, too (i.e. includes the old
   ~MXC_CSPICTRL_EN).

2. We want to reset the whole SPI block here. So it makes no sense
   to first read the old value of the CONREG and write it back, later.
   This will give us the old (historic/random) value of the CONREG back.
   And doesn't reset the CONREG.

   To get a clean CONREG after the reset of the block, too, don't use
   the old (historic/random) value of the CONREG while doing the reset.
   And read the clean CONREG after the reset.

This was found while working on a SPI boot device where the i.MX6 boot
ROM has already initialized the SPI block. The initialization by the
boot ROM might be different to what the U-Boot driver wants to configure.
I.e. we need a clean reset of SPI block, including the CONREG.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoARM: bcm2835: fix get_timer() to return ms
Stephen Warren [Wed, 27 Mar 2013 18:43:23 +0000 (18:43 +0000)]
ARM: bcm2835: fix get_timer() to return ms

Apparently, CONFIG_SYS_HZ must be 1000. Change this, and fix the timer
driver to conform to this.

Have the timer implementation export a custom API get_timer_us() for use
by the BCM2835 MMC API, which needs us resolution for a HW workaround.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
11 years agocfi_flash: Use uintptr_t for casts from u32 to void *
Stefan Roese [Wed, 3 Apr 2013 00:47:46 +0000 (02:47 +0200)]
cfi_flash: Use uintptr_t for casts from u32 to void *

This fixes this build warning:

Configuring for qemu_mips64 - Board: qemu-mips64, Options: SYS_BIG_ENDIAN
   text    data     bss     dec     hex filename
 215344   13082  218720  447146   6d2aa qemu_mips64/u-boot
cfi_flash.c: In function 'flash_map':
cfi_flash.c:217:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoPrepare v2013.04-rc2 v2013.04-rc2
Tom Rini [Wed, 3 Apr 2013 19:02:40 +0000 (15:02 -0400)]
Prepare v2013.04-rc2

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoi.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
Javier Martinez Canillas [Tue, 2 Apr 2013 23:57:23 +0000 (23:57 +0000)]
i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command

board/freescale/mx6qsabrelite/README explain a procedure to
update the SPI-NOR on the SabreLite board without Freescale
manufacturing tool but following this procedure leads to both
"sf erase" and "sf write" failing on a mx6qsabrelite board:

MX6QSABRELITE U-Boot > sf probe 1
MX6QSABRELITE U-Boot > sf erase 0 0x40000
SPI flash erase failed
MX6QSABRELITE U-Boot > sf write 0x10800000 0 0x40000
SPI flash write failed

This is because the chip-select 1 is wrong and the correct
value is 0x7300.

Since commit c1173bd0 ("sf command: allow default bus and chip selects")
the chip-select and bus arguments for the sf probe command are optional
so let's just remove it and use "sf probe" instead.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>