]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Thu, 7 Nov 2013 08:32:16 +0000 (09:32 +0100)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agoMerge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)]
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

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

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

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

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: get rid of too many ifdeffery
Bo Shen [Mon, 21 Oct 2013 08:14:00 +0000 (16:14 +0800)]
arm: atmel: get rid of too many ifdeffery

Get rid of too many ifdeffery in usb ohci driver

Add following two configuration for USB clock selecting
- CONFIG_USB_ATMEL_CLK_SEL_PLLB: using PLLB as usb ohci input clock
- CONFIG_USB_ATMEL_CLK_SEL_UPLL: using UPLL as usb ohci input clock

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agoarm: atmel: at91sam9n12ek: add usb host support
Bo Shen [Mon, 21 Oct 2013 08:13:59 +0000 (16:13 +0800)]
arm: atmel: at91sam9n12ek: add usb host support

Add usb host support for at91sam9n12ek board.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agonet: macb: get DMA bus width from design config register
Bo Shen [Wed, 18 Sep 2013 07:07:44 +0000 (15:07 +0800)]
net: macb: get DMA bus width from design config register

Get DMA bus width from design config register

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agowandboard: README: Include the quad version
Fabio Estevam [Fri, 27 Sep 2013 02:10:56 +0000 (23:10 -0300)]
wandboard: README: Include the quad version

Wandboard quad was not ported into U-boot at the time of writing the README.

Add it to the list of Wandboard variants.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoRevert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"
Stefano Babic [Fri, 1 Nov 2013 07:33:08 +0000 (08:33 +0100)]
Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"

This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd.

Patch was merged too fast, without checking that another patch
is fixing the reported issue globally - reverted.

Signed-off--by: Stefano Babic <sbabic@denx.de>
11 years agoTI:omap5: Add rdaddr, use consistent loadaddr values
Tom Rini [Fri, 18 Oct 2013 22:04:19 +0000 (18:04 -0400)]
TI:omap5: Add rdaddr, use consistent loadaddr values

rdaddr was missing which is a common location for loading ramdisks to.
loadaddr was higher than it needs to be, so use the same value other TI
platforms use.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoARM: OMAP5: DDR3: Change io settings
SRICHARAN R [Thu, 17 Oct 2013 11:05:38 +0000 (16:35 +0530)]
ARM: OMAP5: DDR3: Change io settings

The change from 0x64656465 to 0x64646464 is to remove the weak pull
enabled on DQS, nDQS lines. This pulls the differential signals in the
same direction which is not intended. So disabling the weak pulls improves
signal integrity.

On the uEVM there are 4 DDR3 devices.  The VREF for 2 of the devices is powered by
the OMAP's VREF_CA_OUT pins.  The VREF on the other 2 devices is powered by the OMAP's
VREF_DQ_OUT pins.  So the net effect here is that only half of the DDR3 devices were being
supplied a VREF!  This was clearly a mistake.  The second change improves the robustness of
the interface and was specifically seen to cure corruption observed at high temperatures
on some boards.

With the above two changes better memory stability was observed with extended
temperature ranges around 100C.

Signed-off-by: Sricharan R <r.sricharan@ti.com>
11 years agocm_t35: update lcd predefines
Nikita Kiryanov [Mon, 7 Oct 2013 15:55:46 +0000 (18:55 +0300)]
cm_t35: update lcd predefines

Current predefines do not fit cm-t3730 very well (some of them produce
artifacts in the image).
Update LCD predefines to accommodate both cm-t35 and cm-t3730 modules.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agocm_t35: turn on GPIO commands
Nikita Kiryanov [Mon, 7 Oct 2013 14:28:50 +0000 (17:28 +0300)]
cm_t35: turn on GPIO commands

Turn on GPIO commands for cm-t35 and cm-t3730.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agocm_t35: reduce default bootdelay to 3 seconds
Nikita Kiryanov [Mon, 7 Oct 2013 14:28:49 +0000 (17:28 +0300)]
cm_t35: reduce default bootdelay to 3 seconds

Current default bootdelay of 10 seconds is too long.
Reduce default bootdelay to 3 seconds.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agodra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 build
Minal Shah [Fri, 4 Oct 2013 18:52:02 +0000 (14:52 -0400)]
dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 build

UART booting is supported on this SoC, but via UART3 rather than UART1.
Because of this we must change the board to use UART3 for all console
access (only one UART is exposed on this board and a slight HW mod is
required to switch UARTs).

Signed-off-by: Minal Shah <minal.shah@ti.com>
[trini: Make apply to mainline, reword commit]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address
Tom Rini [Fri, 4 Oct 2013 14:51:40 +0000 (10:51 -0400)]
TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address

With changes to increase the size of the device tree (required to move
more data out of the kernel and into DT), loading the args at the old
address leads to us overwriting things later on.  To correct this, load
the args file to where we load the device tree anyhow.  This is also
safe for non-DT booting as in either case we use r2 to pass in the
location of things.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x: Enable CONFIG_OMAP_WATCHDOG support
Tom Rini [Tue, 1 Oct 2013 16:32:04 +0000 (12:32 -0400)]
am335x: Enable CONFIG_OMAP_WATCHDOG support

There is a board-specific portion for calling watchdog enable itself, in
main U-Boot.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agocm-t35: move the display code to common place
Igor Grinberg [Mon, 16 Sep 2013 18:49:59 +0000 (21:49 +0300)]
cm-t35: move the display code to common place

Compulab OMAP3 boards use the same display initialization code.
Move the display initialization code to live under board/compulab/common
directory.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
11 years agocm-t35: move the eeprom code to common place
Igor Grinberg [Mon, 16 Sep 2013 18:49:58 +0000 (21:49 +0300)]
cm-t35: move the eeprom code to common place

Compulab boards use the same eeprom code, so move the eeprom related
code to live under board/compulab/common directory.
Also make several adjustments to eeprom functions namespace, so it will
be generic for compulab boards.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
11 years agotricorder: support 256MiB SDRAM on revision > D
Andreas Bießmann [Fri, 6 Sep 2013 13:04:58 +0000 (15:04 +0200)]
tricorder: support 256MiB SDRAM on revision > D

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: read kernel directly from NAND
Andreas Bießmann [Fri, 6 Sep 2013 13:04:57 +0000 (15:04 +0200)]
tricorder: read kernel directly from NAND

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: switch to alternative memtest
Thomas Weber [Fri, 6 Sep 2013 13:04:56 +0000 (15:04 +0200)]
tricorder: switch to alternative memtest

Increase the tested memory region for mtest and define
CONFIG_SYS_MEMTEST_SCRATCH for CONFIG_SYS_ALT_MEMTEST

Signed-off-by: Thomas Weber <thomas.weber@corscience.de>
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: Make u-boot faster
Thomas Weber [Fri, 6 Sep 2013 13:04:55 +0000 (15:04 +0200)]
tricorder: Make u-boot faster

Silent u-boot and no bootdelay

Signed-off-by: Thomas Weber <thomas.weber@corscience.de>
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: add led support
Andreas Bießmann [Fri, 6 Sep 2013 13:04:54 +0000 (15:04 +0200)]
tricorder: add led support

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: panic() on unknown board
Andreas Bießmann [Fri, 6 Sep 2013 13:04:53 +0000 (15:04 +0200)]
tricorder: panic() on unknown board

Also hang() the board on panic().

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: add tricordereeprom command
Andreas Bießmann [Fri, 6 Sep 2013 13:04:52 +0000 (15:04 +0200)]
tricorder: add tricordereeprom command

The new tricordereeprom command can read and write the eeprom for hardware
detection on tricorder devices.

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: add mtdparts to environment
Andreas Bießmann [Fri, 6 Sep 2013 13:04:51 +0000 (15:04 +0200)]
tricorder: add mtdparts to environment

Before we always ran 'mtdparts default' which also set the mtdparts and mtdids
environment. But if we changed that values by intention we will overwrite
them with our default values. This is obviously bad!

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: add cmdline history
Andreas Bießmann [Fri, 6 Sep 2013 13:04:50 +0000 (15:04 +0200)]
tricorder: add cmdline history

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: add configuration for a flashcard u-boot
Andreas Bießmann [Fri, 6 Sep 2013 13:04:49 +0000 (15:04 +0200)]
tricorder: add configuration for a flashcard u-boot

The 'flashcard' u-boot configuration has a readonly environment and boots a
bare kernel/initrd to program the device from an clean environment.

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: use generic provided loadaddr
Andreas Bießmann [Fri, 6 Sep 2013 13:04:48 +0000 (15:04 +0200)]
tricorder: use generic provided loadaddr

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: update flash partitioning
Andreas Bießmann [Fri, 6 Sep 2013 13:04:47 +0000 (15:04 +0200)]
tricorder: update flash partitioning

The new flash layout respects posible bad blocks in sectors reserved for e.g.
SPL, u-boot, kernel, env a.s.o.

Additionally this patch prepares for U-Boot Falcon mode for boot time saving.

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agotricorder: remove lcdmode from bootargs
Thomas Weber [Fri, 6 Sep 2013 13:04:46 +0000 (15:04 +0200)]
tricorder: remove lcdmode from bootargs

Signed-off-by: Thomas Weber <thomas.weber@corscience.de>
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
11 years agoarm, da85x: update for the ipam390 board
Heiko Schocher [Fri, 6 Sep 2013 03:21:24 +0000 (05:21 +0200)]
arm, da85x: update for the ipam390 board

- switch to correct ecc layout used by the RBL
  enable CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
- update default environment
- change A2CR to correct value for UART boot mode
- adapt cs3cfg timings for nand
- change LED bootmode signalization

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agonand, davinci: add special UBL ecc position
Heiko Schocher [Fri, 6 Sep 2013 03:21:23 +0000 (05:21 +0200)]
nand, davinci: add special UBL ecc position

enable the RBL/UBL ECC layout through
CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC define

see for more info:
http://processors.wiki.ti.com/index.php/DM365_Nand_ECC_layout

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
Cc: Scott Wood <scottwood@freescale.com>
11 years agoARM: OMAP4: Convert to ti_armv7_common.h
Lokesh Vutla [Tue, 3 Sep 2013 14:17:18 +0000 (19:47 +0530)]
ARM: OMAP4: Convert to ti_armv7_common.h

Update omap4_common.h to use ti_armv7_common.h

Testing:
* Boot tested on OMAP4430 ES2.1 OMAP4460 ES1.1 SDP, OMAP4 PANDA/PANDA ES
* Verified ./MAKEALL -s omap

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoOMAP3: igep00x0: rename config file to omap3_igep00x0.h
Javier Martinez Canillas [Mon, 2 Sep 2013 08:04:02 +0000 (10:04 +0200)]
OMAP3: igep00x0: rename config file to omap3_igep00x0.h

There seems to be a naming convention for the configuration
files for boards using the same SoC family. This makes
easier to do changes that affect different boards based
on the same SoC.

Since the IGEPv2 board and the IGEP COM Module use a TI
OMAP35xx/DM37xx processor, is better to rename its board
config to use this naming scheme.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
11 years agoARM: IGEP0033: rename config file to am335x_igep0033.h
Javier Martinez Canillas [Mon, 2 Sep 2013 08:04:01 +0000 (10:04 +0200)]
ARM: IGEP0033: rename config file to am335x_igep0033.h

There seems to be a naming convention for the configuration
files for boards using the same SoC family. This makes
easier to do changes that affect different boards based
on the same SoC.

Since the IGEP COM AQUILA use a TI AM335x processor is better
to rename its board config to use this naming scheme.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
11 years agoTI:am33xx: Add bootcount support to ti_am335x_common.h
Tom Rini [Wed, 28 Aug 2013 13:00:30 +0000 (09:00 -0400)]
TI:am33xx: Add bootcount support to ti_am335x_common.h

Enable the bootcount driver for am335x in general.  We leave adding a
bootlimit and altbootcmd to the environment to the board ports.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agobootcount_davinci: Switch to scratch register #2
Tom Rini [Wed, 28 Aug 2013 13:00:29 +0000 (09:00 -0400)]
bootcount_davinci: Switch to scratch register #2

The RTC IP block here provides 3 scratch registers.  Currently when
using DeepSleep on am335x the scratch0/1 registers are used so moving
ourself to scratch2 makes cooperation easier.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam33xx, davinci: Create and use <asm/davinci_rtc.h>
Tom Rini [Wed, 28 Aug 2013 13:00:28 +0000 (09:00 -0400)]
am33xx, davinci: Create and use <asm/davinci_rtc.h>

Create a common header file for the RTC IP block that is shared between
davinci and am33xx.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agodrivers/rtc/davinci.c: Reference DAVINCI_RTC_BASE more directly
Tom Rini [Wed, 28 Aug 2013 13:00:27 +0000 (09:00 -0400)]
drivers/rtc/davinci.c: Reference DAVINCI_RTC_BASE more directly

We shouldn't rely on a define to hide this cast for us.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoconfigs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards
Fabio Estevam [Thu, 31 Oct 2013 16:46:41 +0000 (14:46 -0200)]
configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards

There is no real benefit in adding the board name into U-boot's prompt.

Use the simple "=> " prompt across FSL boards.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agoi.MX6: nitrogen6x: fix erase size in 6x_upgrade.txt
Eric Nelson [Wed, 9 Oct 2013 19:25:15 +0000 (12:25 -0700)]
i.MX6: nitrogen6x: fix erase size in 6x_upgrade.txt

The 6x_upgrade script is used to upgrade U-Boot in SPI-NOR
on Nitrogen6x/SABRE Lite boards using U-Boot's 'sf' command.

U-Boot is placed at offset 0x400 in flash, and the script
currently only erases 0x50000 bytes. Since the current
head is 319k, any additional features enabled in the
configuration will exceed the space erased and cause errors
re-programming the device.

This patch increases the erase size to the full size of
the region allocated for the U-Boot binary.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoARM: mxs: Configure 2 Gbit DDR2 RAM for BG0900
Christoph G. Baumann [Mon, 28 Oct 2013 11:29:31 +0000 (12:29 +0100)]
ARM: mxs: Configure 2 Gbit DDR2 RAM for BG0900

The BG0900 module has 2Gbit DRAM module on it, adjust the DataBahn
DRAM controller registers so the DRAM module will be correctly
recognised.

Signed-off-by: Christoph G. Baumann <c.baumann@ppc-ag.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoARM: mxs: Enable DCDC converter for battery boot
Marek Vasut [Mon, 28 Oct 2013 11:29:30 +0000 (12:29 +0100)]
ARM: mxs: Enable DCDC converter for battery boot

In case the board detected sufficient voltage for battery boot,
make sure the DCDC converter is ON and the board is not running
only from linregs, otherwise an instability will be observed.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin
Otavio Salvador [Mon, 21 Oct 2013 23:34:57 +0000 (21:34 -0200)]
mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin

This removes the PAD_CTL_DSE_120ohm as done for i.MX6Q's IPU1_DI0_PIN4
pin definition and makes it aligned with 3.0.35-4.1.0 and 3.12
mainline kernel.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agomx5: lowlevel_init: Remove unused macro
Fabio Estevam [Mon, 30 Sep 2013 21:28:54 +0000 (18:28 -0300)]
mx5: lowlevel_init: Remove unused macro

setup_wdog macro is not used anywhere, so just remove it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
11 years agoARM: mx5: Enable L2 cache
Fabio Estevam [Mon, 30 Sep 2013 16:16:52 +0000 (13:16 -0300)]
ARM: mx5: Enable L2 cache

Enable L2 cache for improving the system performance.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoimx_watchdog: do not soft-reset while watchdog init
Anatolij Gustschin [Mon, 30 Sep 2013 10:52:38 +0000 (12:52 +0200)]
imx_watchdog: do not soft-reset while watchdog init

Currently the driver clears WCR_SRS bit when enabling
the watchdog and this causes a software reset. Do not
clear WCR_SRS.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
11 years agoARM: mxs: Setup stack in JTAG mode
Marek Vasut [Thu, 19 Sep 2013 23:36:44 +0000 (01:36 +0200)]
ARM: mxs: Setup stack in JTAG mode

In case the MX23/MX28 is switched into JTAG mode via the BootMode select
switches, the BootROM bypasses the CPU core registers initialization.
This in turn means that the Stack Pointer (SP) register is not set as
it is in every other mode of operation, but instead is only zeroed out.

To prevent U-Boot SPL from crashing in this obscure JTAG mode, configure
the SP to point at the CONFIG_SYS_INIT_SP_ADDR if the SP is zeroed out.

Note that in case the SP is already configured, we must preserve that exact
SP value and must not modify it. This is important since in every other mode
but the JTAG mode, the SPL returns into the BootROM and BootROM in turn loads
U-Boot itself. If the SP were to be corrupted, the BootROM won't be able to
continue it's operation after returned from SPL and the system would crash.

Finally, add the JTAG mode switch identifier, so it's not recognised as
Unknown mode.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
11 years agoARM: mxs: Add PPC-AG BG0900 board
Marek Vasut [Fri, 20 Sep 2013 14:14:13 +0000 (16:14 +0200)]
ARM: mxs: Add PPC-AG BG0900 board

This board supports FEC Ethernet, SPI NOR and NAND flash.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Christoph Baumann <c.baumann@ppc-ag.de>
11 years agoudoo: Add initial support for mx6q udoo board
Fabio Estevam [Fri, 27 Sep 2013 01:59:25 +0000 (22:59 -0300)]
udoo: Add initial support for mx6q udoo board

Add basic support for mx6q udoo board.

For further information about Udoo board:
http://www.udoo.org/

Tested booting a mainline device tree kernel and a Yocto rootfs from mmc.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoARM: mxs: tools: Use mkimage for BootStream generation
Marek Vasut [Tue, 24 Sep 2013 15:39:17 +0000 (17:39 +0200)]
ARM: mxs: tools: Use mkimage for BootStream generation

Now that mkimage can generate an BootStream for i.MX23 and i.MX28,
use the mkimage as a default tool to generate the BootStreams instead
of the elftosb tool. This cuts out another obscure dependency.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx6: compute PLL PFD frequencies rather than using defines
Pierre Aubert [Thu, 19 Sep 2013 15:48:59 +0000 (17:48 +0200)]
mx6: compute PLL PFD frequencies rather than using defines

Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
CC: Stefano Babic <sbabic@denx.de>
11 years agoarm: Remove IXP425 boards pdnb3 and scpu
Stefan Roese [Tue, 24 Sep 2013 06:22:19 +0000 (08:22 +0200)]
arm: Remove IXP425 boards pdnb3 and scpu

Remove Prodrive pdnb3 board (including the scpu variant) support
from mainline. As its unmaintained and not needed any more for
quite some time.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Martijn de Gouw <martijn.de.gouw@prodrive.nl>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
11 years agozynq: Use arch_cpu_init() instead of lowlevel_init()
Michal Simek [Thu, 22 Aug 2013 12:52:02 +0000 (14:52 +0200)]
zynq: Use arch_cpu_init() instead of lowlevel_init()

Zynq lowlevel_init() was implemented in C but stack
pointer is setup after function call in _main().
Move architecture setup to arch_cpu_init() which is call
as the first function in board_init_f() which
already have correct stack pointer.

Reported-by: Sven Schwermer <sven.schwermer@tuhh.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoPrepare v2013.10
Tom Rini [Wed, 16 Oct 2013 17:08:12 +0000 (13:08 -0400)]
Prepare v2013.10

Signed-off-by: Tom Rini <trini@ti.com>
11 years agomicroblaze: Fix watchdog initialization
Michal Simek [Wed, 16 Oct 2013 07:06:32 +0000 (09:06 +0200)]
microblaze: Fix watchdog initialization

The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
(sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63)
changed hw_watchdog_init() prototype which didn't match
with Microblaze one.
This patch fixes the driver and Microblaze initialization.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agocommon: fsl: Fix broken SPDX-License-Identifier change
Michal Simek [Wed, 16 Oct 2013 07:06:31 +0000 (09:06 +0200)]
common: fsl: Fix broken SPDX-License-Identifier change

This bug was introduced by:
"Add GPL-2.0+ SPDX-License-Identifier to source files"
(sha1: 1a4596601fd395f3afb8f82f3f840c5e00bdd57a)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agomtd: fix warnings due to 64-bit partition support
Scott Wood [Tue, 15 Oct 2013 22:41:27 +0000 (17:41 -0500)]
mtd: fix warnings due to 64-bit partition support

commit 39ac34473f3c96e77cbe03a49141771ed1639486 ("cmd_mtdparts: use 64
bits for flash size, partition size & offset") introduced warnings
in a couple places due to printf formats or pointer casting.

This patch fixes the warnings pointed out here:
http://lists.denx.de/pipermail/u-boot/2013-October/164981.html

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Tom Rini <trini@ti.com>
11 years agospi: mxc_spi: Fix double incrementing read pointer for unaligned buffers
Timo Herbrecher [Tue, 15 Oct 2013 18:35:09 +0000 (00:05 +0530)]
spi: mxc_spi: Fix double incrementing read pointer for unaligned buffers

If dout buffer is not 32 bit-aligned or data to transmit is not multiple
of 32 bit the read data pointer is already incremented on single byte reads.

Signed-off-by: Timo Herbrecher <t.herbrecher@gateware.de>
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agosf: probe: Add missing Atmel at25df321 flash
Bo Shen [Thu, 10 Oct 2013 05:07:37 +0000 (13:07 +0800)]
sf: probe: Add missing Atmel at25df321 flash

As the spi flash transfer to multiple parts, it is forgot to add
Atmel AT25DF321 spi flash support, which broken several Atmel EK
boards which this chip. So, add it

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
11 years agospi: Add GPL-2.0+ SPDX-License-Identifier for missing files
Jagannadha Sutradharudu Teki [Mon, 14 Oct 2013 08:01:24 +0000 (13:31 +0530)]
spi: Add GPL-2.0+ SPDX-License-Identifier for missing files

Added GPL-2.0+ SPDX-License-Identifier for missed spi
source files.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agosf: Add GPL-2.0+ SPDX-License-Identifier for missing ones
Jagannadha Sutradharudu Teki [Thu, 10 Oct 2013 17:02:55 +0000 (22:32 +0530)]
sf: Add GPL-2.0+ SPDX-License-Identifier for missing ones

Added GPL-2.0+ SPDX-License-Identifier for missed sf
source files.

Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
11 years agosf: Minor cleanups.
Jagannadha Sutradharudu Teki [Thu, 10 Oct 2013 16:44:09 +0000 (22:14 +0530)]
sf: Minor cleanups.

- Add comments.
- Renamed few macros.
- Add tabs.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
11 years agosf_ops: Unify bank_sel calculation code
Jagannadha Sutradharudu Teki [Tue, 8 Oct 2013 17:56:47 +0000 (23:26 +0530)]
sf_ops: Unify bank_sel calculation code

Unified the bank_sel calculation code for erase and
write ops.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agobuildman: Use env to pick the python from $PATH
Jagannadha Sutradharudu Teki [Sat, 28 Sep 2013 17:38:14 +0000 (23:08 +0530)]
buildman: Use env to pick the python from $PATH

python used in buildman doesn't need to be placed in
/usr/bin/python, So use env to ensure that the interpreter
will pick the python from environment.

Usefull with several versions of python's installed on system.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoMerge branch 'buildman' of git://git.denx.de/u-boot-x86
Tom Rini [Tue, 15 Oct 2013 00:19:56 +0000 (20:19 -0400)]
Merge branch 'buildman' of git://git.denx.de/u-boot-x86

11 years agocmd_sandbox.c: Update for do_(load|save) not taking a number base
Tom Rini [Thu, 10 Oct 2013 14:46:22 +0000 (10:46 -0400)]
cmd_sandbox.c: Update for do_(load|save) not taking a number base

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoPrevent null pointer dereference originating in cmd_pxe.c
Steven Falco [Mon, 7 Oct 2013 13:51:48 +0000 (09:51 -0400)]
Prevent null pointer dereference originating in cmd_pxe.c

Pass a valid cmdtp into do_tftpb(), do_ext2load(), and do_get_fat(), to
avoid possible crashes due to null pointer dereferencing.

Commit d7884e047d08447dfd1374e9fa2fdf7ab36e56f5 does not go far enough.
There is still at least one call chain that can result in a crash.

The do_tftpb(), do_ext2load(), and do_get_fat() functions expect a valid
cmdtp.  Passing in NULL is particularly bad in the do_tftpb() case,
because eventually boot_get_kernel() will be called with a NULL cmdtp:

do_tftpb() -> netboot_common() -> bootm_maybe_autostart() -> do_bootm()
-> do_bootm_states() -> bootm_find_os() -> boot_get_kernel()

Around line 991 in cmd_bootm.c, boot_get_kernel() will dereference the
null pointer, and the board will crash.

Signed-off-by: Steven A. Falco <stevenfalco@gmail.com>
11 years agoCoding Style cleanup: drop some excessive empty lines
Wolfgang Denk [Fri, 4 Oct 2013 15:43:26 +0000 (17:43 +0200)]
Coding Style cleanup: drop some excessive empty lines

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoCoding Style cleanup: remove trailing empty lines
Wolfgang Denk [Fri, 4 Oct 2013 15:43:25 +0000 (17:43 +0200)]
Coding Style cleanup: remove trailing empty lines

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoCoding Style cleanup: replace leading SPACEs by TABs
Wolfgang Denk [Fri, 4 Oct 2013 15:43:24 +0000 (17:43 +0200)]
Coding Style cleanup: replace leading SPACEs by TABs

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Drop changes for PEP 4 following python tools]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoCoding Style cleanup: remove trailing white space
Wolfgang Denk [Mon, 7 Oct 2013 11:07:26 +0000 (13:07 +0200)]
Coding Style cleanup: remove trailing white space

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agoARM: omap4-panda: Add MAC address creation for panda
Dan Murphy [Thu, 10 Oct 2013 13:54:23 +0000 (08:54 -0500)]
ARM: omap4-panda: Add MAC address creation for panda

Add a MAC address create based on the OMAP die ID registers.
Then poplulate the ethaddr enviroment variable so that the device
tree alias can be updated prior to boot.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agopmic: max77686: fix the wrong offset
Jaehoon Chung [Mon, 30 Sep 2013 05:23:37 +0000 (14:23 +0900)]
pmic: max77686: fix the wrong offset

0x1D is reserved. So BUCK3DVS1 is started from 0x1e.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
11 years agoenv_mmc: fix buffer allocation for armv7
Markus Niebel [Fri, 4 Oct 2013 13:48:03 +0000 (15:48 +0200)]
env_mmc: fix buffer allocation for armv7

commit d196bd880347373237d73e0d115b4d51c68cf2ad adds
redundand environment to mmc. The usage of malloc in
env_relocate_spec triggers cache errors on armv7.

Tested on a not mainlined i.MX53 board:

Board: TQMa53
I2C:   ready
DRAM:  512 MiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1
ERROR: v7_dcache_inval_range - start address is not aligned - 0x8f57c2d8
ERROR: v7_dcache_inval_range - stop address is not aligned - 0x8f57e2d8
ERROR: v7_dcache_inval_range - start address is not aligned - 0x8f57e2e0
ERROR: v7_dcache_inval_range - stop address is not aligned - 0x8f5802e0
Using default environment

Signed-off-by: Markus Niebel <Markus.Niebel@tqs.de>
11 years agoenv: dataflash: fix env_init issue
Bo Shen [Tue, 8 Oct 2013 08:30:21 +0000 (16:30 +0800)]
env: dataflash: fix env_init issue

As the SPI controller is not initialized before env_init(), it causes
reading env in dataflash failed. So, although saveenv() successfully,
it shows warning information when reboot the system as following:

  *** Warning - bad CRC, using default environment

Let the env_relocate() to check env CRC and import it.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
11 years agoARM: omap4: Update sdram setting for panda rev A6
Dan Murphy [Wed, 9 Oct 2013 18:53:58 +0000 (13:53 -0500)]
ARM: omap4: Update sdram setting for panda rev A6

OMAP4 panda rev A6 is a 4430 es2.3 IC with an updated memory
part.

The panda rev A6 uses Elpida 2x4Gb memory and no longer uses Micron
so the timings needs to be updated

Signed-off-by: Dan Murphy <dmurphy@ti.com>
11 years agoam335x_evm.h: Make 'am335x_boneblack' use redundant environment
Tom Rini [Thu, 10 Oct 2013 14:25:18 +0000 (10:25 -0400)]
am335x_evm.h: Make 'am335x_boneblack' use redundant environment

Signed-off-by: Tom Rini <trini@ti.com>
11 years ago.gitignore: add auto-generated /include/[s|t]pl-autoconf.mk
Daniel Schwierzeck [Sun, 13 Oct 2013 15:08:02 +0000 (17:08 +0200)]
.gitignore: add auto-generated /include/[s|t]pl-autoconf.mk

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
11 years agoSPDX: document dual license notation
Wolfgang Denk [Tue, 8 Oct 2013 19:53:45 +0000 (21:53 +0200)]
SPDX: document dual license notation

In [1] we discussed how we should deal with dual (or, more generally,
multiple) licensed files.  Add this to  Licenses/README  so it's
properly documented.

[1] http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/166518

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Add the word 'list' to the end of the line, per Stephen Warren's
feedback]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Mon, 14 Oct 2013 15:20:32 +0000 (11:20 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Tom Rini [Mon, 14 Oct 2013 13:37:51 +0000 (09:37 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

11 years agoMerge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Albert ARIBAUD [Fri, 11 Oct 2013 12:47:25 +0000 (14:47 +0200)]
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

11 years agobuildman: don't fail --list-toolchains when toolchains fail
Stephen Warren [Wed, 9 Oct 2013 20:28:09 +0000 (14:28 -0600)]
buildman: don't fail --list-toolchains when toolchains fail

When a toolchain invocation fails, an exception is thrown but not caught
which then aborts the entire toolchain detection process. To solve this,
request that exceptions not be thrown, since the toolchain init code
already error-checks the command result. This solves e.g.:

         - found '/usr/bin/winegcc'
Traceback (most recent call last):
...
Exception: Error running '/usr/bin/winegcc --version'

Change-Id: I579c72ab3b021e38b14132893c3375ea257c74f0
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
(formatted to 80cols)

11 years agousb: Prevent using reserved registers on DM36x usb
Andrew Murray [Sun, 29 Sep 2013 17:02:22 +0000 (18:02 +0100)]
usb: Prevent using reserved registers on DM36x usb

The musb driver defines and uses MUSB_CSR0_H_DIS_PING, however this
bit is reserved on the DM36x. Thus this patch ensures that the
reserved bit is not accesssed.

It has been observed that some USB devices will fail to enumerate
with errors such as 'error in inquiry' without this patch.

See http://www.ti.com/litv/pdf/sprufh9a for details.

Cc: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Andrew Murray <amurray@embedded-bits.co.uk>
Acked-by: Marek Vasut <marex@denx.de>
11 years agoomap5_common: Re-work mmc boot to try SD and eMMC, correct root device
Tom Rini [Wed, 9 Oct 2013 14:59:33 +0000 (10:59 -0400)]
omap5_common: Re-work mmc boot to try SD and eMMC, correct root device

OMAP5 boards may have both eMMC (on MMC2) and an SD slot (on MMC1).  We
Update the default bootcmd to match what happens on AM335x where we try
SD first, and then eMMC.  In this case however, the hardware layout used
for powering both of these means that in the kernel eMMC shall be found
first as it is powered by a fixed regulator and SD found second as SD is
powered via the palmas which will result in deferred probing.

Tested-by: Aparna Balasubramanian <aparnab@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agocmd_ubi: add write.part command, to write a volume in multiple parts
Paul Burton [Wed, 4 Sep 2013 14:16:59 +0000 (15:16 +0100)]
cmd_ubi: add write.part command, to write a volume in multiple parts

This allows you to write data to an UBI volume when the amount of memory
available to write that data from is less than the total size of the
data. For example, you may split a root filesystem UBIFS image into
parts, provide the total size of the image to the first write.part
command and then use multiple write.part commands to write the
subsequent parts of the volume. This results in a sequence of commands
akin to:

  ext4load mmc 0:1 0x80000000 rootfs.ubifs.0
  ubi write.part 0x80000000 root 0x08000000 0x18000000
  ext4load mmc 0:1 0x80000000 rootfs.ubifs.1
  ubi write.part 0x80000000 root 0x08000000
  ext4load mmc 0:1 0x80000000 rootfs.ubifs.2
  ubi write.part 0x80000000 root 0x08000000

This would write 384MiB of data to the UBI volume 'root' whilst only
requiring 128MiB of said data to be held in memory at a time.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Stefan Roese <sr@denx.de>
11 years agocmd_ubi: use int64_t volume size for 'ubi create'
Paul Burton [Wed, 4 Sep 2013 14:16:58 +0000 (15:16 +0100)]
cmd_ubi: use int64_t volume size for 'ubi create'

int64_t matches the bytes field in struct ubi_mkvol_req to which the
size is assigned. With the prior signed 32 bit integer, volumes were
restricted to being less than 2GiB in size.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Stefan Roese <sr@denx.de>
11 years agocmd_mtdparts: use 64 bits for flash size, partition size & offset
Paul Burton [Wed, 4 Sep 2013 14:16:57 +0000 (15:16 +0100)]
cmd_mtdparts: use 64 bits for flash size, partition size & offset

This matches the 64 bit size in struct mtd_info and allows the mtdparts
command to function correctly with a flash >= 4GiB. Format specifiers
for size & offset are given the ll length, matching its use in
drivers/mtd in absence of something like inttypes.h/PRIx64.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Stefan Roese <sr@denx.de>
11 years agomtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN
Paul Burton [Wed, 4 Sep 2013 14:16:56 +0000 (15:16 +0100)]
mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN

Linux modified the MTD driver interface in commit edbc4540 (with the
same name as this commit). The effect is that calls to mtd_read will
not return -EUCLEAN if the number of ECC-corrected bit errors is below
a certain threshold, which defaults to the strength of the ECC. This
allows -EUCLEAN to stop indicating "some bits were corrected" and begin
indicating "a large number of bits were corrected, the data held in
this region of flash may be lost soon". UBI makes use of this and when
-EUCLEAN is returned from mtd_read it will move data to another block
of flash. Without adopting this interface change UBI on U-boot attempts
to move data between blocks every time a single bit is corrected using
the ECC, which is a very common occurance on some devices.

For some devices where bit errors are common enough, UBI can get stuck
constantly moving data around because each block it attempts to use has
a single bit error. This condition is hit when wear_leveling_worker
attempts to move data from one PEB to another in response to an
-EUCLEAN/UBI_IO_BITFLIPS error. When this happens ubi_eba_copy_leb is
called to perform the data copy, and after the data is written it is
read back to check its validity. If that read returns UBI_IO_BITFLIPS
(in response to an MTD -EUCLEAN) then ubi_eba_copy_leb returns 1 to
wear_leveling worker, which then proceeds to schedule the destination
PEB for erasure. This leads to erase_worker running on the PEB, and
following a successful erase wear_leveling_worker is called which
begins this whole cycle all over again. The end result is that (without
UBI debug output enabled) the boot appears to simply hang whilst in
reality U-boot busily works away at destroying a block of the NAND
flash. Debug output from this situation:

  UBI DBG: ensure_wear_leveling: schedule scrubbing
  UBI DBG: wear_leveling_worker: scrub PEB 1027 to PEB 4083
  UBI DBG: ubi_io_read_vid_hdr: read VID header from PEB 1027
  UBI DBG: ubi_io_read: read 4096 bytes from PEB 1027:4096
  UBI DBG: ubi_eba_copy_leb: copy LEB 0:0, PEB 1027 to PEB 4083
  UBI DBG: ubi_eba_copy_leb: read 1040384 bytes of data
  UBI DBG: ubi_io_read: read 1040384 bytes from PEB 1027:8192
  UBI: fixable bit-flip detected at PEB 1027
  UBI DBG: ubi_io_write_vid_hdr: write VID header to PEB 4083
  UBI DBG: ubi_io_write: write 4096 bytes to PEB 4083:4096
  UBI DBG: ubi_io_read_vid_hdr: read VID header from PEB 4083
  UBI DBG: ubi_io_read: read 4096 bytes from PEB 4083:4096
  UBI DBG: ubi_io_write: write 4096 bytes to PEB 4083:8192
  UBI DBG: ubi_io_read: read 4096 bytes from PEB 4083:8192
  UBI: fixable bit-flip detected at PEB 4083
  UBI DBG: schedule_erase: schedule erasure of PEB 4083, EC 55, torture 0
  UBI DBG: erase_worker: erase PEB 4083 EC 55
  UBI DBG: sync_erase: erase PEB 4083, old EC 55
  UBI DBG: do_sync_erase: erase PEB 4083
  UBI DBG: sync_erase: erased PEB 4083, new EC 56
  UBI DBG: ubi_io_write_ec_hdr: write EC header to PEB 4083
  UBI DBG: ubi_io_write: write 4096 bytes to PEB 4083:0
  UBI DBG: ensure_wear_leveling: schedule scrubbing
  UBI DBG: wear_leveling_worker: scrub PEB 1027 to PEB 4083
  ...

This patch adopts the interface change as in Linux commit edbc4540 in
order to avoid such situations. Given that none of the drivers under
drivers/mtd return -EUCLEAN, this should only affect those using
software ECC. I have tested that it works on a board which is
currently out of tree, but which I hope to be able to begin
upstreaming soon.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Stefan Roese <sr@denx.de>
11 years agokm/scripts: fix ramfs
Andreas Huber [Thu, 4 Jul 2013 13:37:34 +0000 (15:37 +0200)]
km/scripts: fix ramfs

'actual_bank' is not used anymore, instead boot_bank is used.

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
11 years agopowerpc/km: drop unused CONFIG_SYS_DTT_LOW_TEMP
Holger Brunck [Thu, 4 Jul 2013 13:37:33 +0000 (15:37 +0200)]
powerpc/km: drop unused CONFIG_SYS_DTT_LOW_TEMP

This define is not used in u-boot code, we can drop this define safely.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
11 years agokm/common: switch on CMD_GREPENV
Holger Brunck [Thu, 4 Jul 2013 13:37:32 +0000 (15:37 +0200)]
km/common: switch on CMD_GREPENV

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
11 years agopowerpc/83xx: remove staticness for qe_iop_conf_tab
Holger Brunck [Thu, 4 Jul 2013 13:37:31 +0000 (15:37 +0200)]
powerpc/83xx: remove staticness for qe_iop_conf_tab

commit a5510058 powerpc/83xx/km: make local functions and structs static

removed the staticness also from this struct. But this struct is needed
in arch/powerpc/cpu/mpc83xx/cpu_init.c and declared as extern.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
11 years agoMerge branch 'next' of git://git.denx.de/u-boot-mpc83xx
Tom Rini [Wed, 9 Oct 2013 14:06:40 +0000 (10:06 -0400)]
Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

11 years agoda850evm.h: Always set CONFIG_CMD_SF, move to by CONFIG_SPI_FLASH
Tom Rini [Tue, 8 Oct 2013 19:08:38 +0000 (15:08 -0400)]
da850evm.h: Always set CONFIG_CMD_SF, move to by CONFIG_SPI_FLASH

When we have CONFIG_SPI_FLASH set we now require CONFIG_CMD_SF.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoRevert "am335x_evm.h: If mmcdev and bootpart switch to mmcdev 1, so should mmcroot."
Tom Rini [Tue, 8 Oct 2013 15:09:17 +0000 (11:09 -0400)]
Revert "am335x_evm.h: If mmcdev and bootpart switch to mmcdev 1, so should mmcroot."

Upon further inspection and review and chatting with kernel folks, what
happens here is that what mmcblk# a device gets is based on probe order.
So a system with an SD card inserted with place eMMC on mmcblk1, but
without an SD card, it will be on mmcblk0.  So U-boot can only provide a
best guess.  In this case, if no SD card is present, we would want to
pass mmcblk0p2 still.  If an SD card is present, it woudl be able to
provide a uEnv.txt that would be loaded (even if the kernel is NOT
there) which can still update mmcroot variable.

This reverts commit 827512fb1154c05c6eb1e2259e936df55c98a535.

Cc: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-arm