oweals/u-boot.git
12 years agodevkit8000/spl: init GPMC for dm9000 in SPL
Simon Schwarz [Thu, 15 Mar 2012 04:01:37 +0000 (04:01 +0000)]
devkit8000/spl: init GPMC for dm9000 in SPL

Linux crashes if the GPMC isn't configured for the dm9000.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
CC: Tom Rini <tom.rini@gmail.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Wolfgang Denk <wd@denx.de>
12 years agoomap-common: Add NAND SPL linux booting
Simon Schwarz [Thu, 15 Mar 2012 04:01:36 +0000 (04:01 +0000)]
omap-common: Add NAND SPL linux booting

This implements booting of Linux from NAND in SPL

Related config parameters:
CONFIG_SYS_NAND_SPL_KERNEL_OFFS
Offset in NAND of direct boot kernel image to use in SPL
CONFIG_SYS_SPL_ARGS_ADDR
Address where the kernel boot arguments are expected - this is
normally RAM-start + 0x100 (on ARM)

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
CC: Tom Rini <tom.rini@gmail.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Wolfgang Denk <wd@denx.de>
12 years agodevkit8000: add config for spl command
Simon Schwarz [Thu, 15 Mar 2012 04:01:35 +0000 (04:01 +0000)]
devkit8000: add config for spl command

This adds some configs for devkit8000 to use the new spl command

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
CC: Tom Rini <tom.rini@gmail.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Wolfgang Denk <wd@denx.de>
12 years agoAdd cmd_spl command
Simon Schwarz [Thu, 15 Mar 2012 04:01:34 +0000 (04:01 +0000)]
Add cmd_spl command

This adds a spl command to the u-boot.

Related config:
CONFIG_CMD_SPL
activate/deactivate the command
CONFIG_CMD_SPL_NAND_OFS
Offset in NAND to use

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tom Rini <tom.rini@gmail.com>
CC: Wolfgang Denk <wd@denx.de>
12 years agomx53ard: Initialize return code with error
Fabio Estevam [Mon, 19 Mar 2012 13:41:25 +0000 (13:41 +0000)]
mx53ard: Initialize return code with error

The variable "rc" is the return of board_eth_init() function. Initialize
it with an error code, so that this function can return an error when
CONFIG_SMC911X is not set.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agomx53: Make PLL2 to be the parent of UART clock
Fabio Estevam [Wed, 21 Mar 2012 05:42:45 +0000 (05:42 +0000)]
mx53: Make PLL2 to be the parent of UART clock

Change the parent UART clock to be PLL2, so that U-boot can also boot
a Freescale 2.6.35 kernel for mx53.

FSL kernel and U-boot changed the UART parent from PLL3 to PLL2 to avoid
conflicts with IPU clocks, so that the video resolution can be changed
without affecting the UART clock.

On a 2.6.35 kernel the serial console is messed up after IPU driver is loaded
and this patch fixes this problem.

Tested on a mx53loco board booting a FSL kernel and also a mainline kernel.

Reported-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
12 years agoconfigs: imx: Use CONFIG_SF_DEFAULT_CS
Fabio Estevam [Thu, 22 Mar 2012 14:29:04 +0000 (14:29 +0000)]
configs: imx: Use CONFIG_SF_DEFAULT_CS

CONFIG_SPI_FLASH_CS is not used anywhere.

Use CONFIG_SF_DEFAULT_CS instead.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agomx28evk: Provide default values for SPI bus and chip select
Fabio Estevam [Thu, 22 Mar 2012 14:29:03 +0000 (14:29 +0000)]
mx28evk: Provide default values for SPI bus and chip select

Provide default values for SPI bus and chip select.

This allows the command "sf probe" to work without passing SPI bus and chip
select numbers as arguments.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoUSB: ehci-mx6: Add proper IO accessors
Fabio Estevam [Mon, 19 Mar 2012 12:36:10 +0000 (12:36 +0000)]
USB: ehci-mx6: Add proper IO accessors

Add proper IO accessors for mx6 usb registers.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Jason Liu <r64343@freescale.com>
12 years agomx6: Read silicon revision from register
Fabio Estevam [Tue, 20 Mar 2012 04:21:45 +0000 (04:21 +0000)]
mx6: Read silicon revision from register

Instead of hardcoding the mx6 silicon revision, read it in run-time.

Also, besides the silicon version print the mx6 variant type: quad,dual/solo
or solo-lite.

Tested on a mx6qsabrelite, where it shows:

CPU:   Freescale i.MX6Q rev1.0 at 792 MHz

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Jason Liu <r64343@freescale.com>
12 years agoi.MX28: Drop __naked function from spl_mem_init
Marek Vasut [Fri, 16 Mar 2012 11:32:43 +0000 (11:32 +0000)]
i.MX28: Drop __naked function from spl_mem_init

Instead of compiling the function and using the result as a constant, simply use
the constant.

NOTE: This patch works around bug:

  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52546

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@ti.com>
12 years agomxs_spi: Return proper timeout error
Fabio Estevam [Sun, 18 Mar 2012 17:23:35 +0000 (17:23 +0000)]
mxs_spi: Return proper timeout error

Instead of returning -1, it is preferred to return -ETIMEDOUT in case of timeouts.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoi.MX28: Make the stabilization delays shorter
Marek Vasut [Mon, 30 Jan 2012 14:05:39 +0000 (14:05 +0000)]
i.MX28: Make the stabilization delays shorter

Cut down the VDDIO/VDDA regulator stabilization delays to 500 uS. That should be
enough according to the datasheet and bootlets.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Robert Deliën <robert@delien.nl>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Matthias Fuchs <matthias.fuchs@esd.eu>
12 years agopmic_i2c: Return error in case of invalid pmic_i2c_tx_num
Fabio Estevam [Fri, 16 Mar 2012 11:32:09 +0000 (11:32 +0000)]
pmic_i2c: Return error in case of invalid pmic_i2c_tx_num

Return error in case of invalid pmic_i2c_tx_num.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agomx6: Remove duplicate definition of ANATOP_BASE_ADDR
Fabio Estevam [Tue, 13 Mar 2012 07:26:49 +0000 (07:26 +0000)]
mx6: Remove duplicate definition of ANATOP_BASE_ADDR

Remove duplicate definition of ANATOP_BASE_ADDR.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx6: Fix reset cause for Power On Reset case
Fabio Estevam [Tue, 13 Mar 2012 07:26:48 +0000 (07:26 +0000)]
mx6: Fix reset cause for Power On Reset case

After booting mx6qsabrelite from POR the following is reported:

CPU:   Freescale i.MX61 family rev1.0 at 792 MHz
Reset cause: unknown reset

This is because both the POR and WDOG bits are set after reset.

Fix this by also checking both bits in the POR case.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoi.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE
Eric Nelson [Sun, 4 Mar 2012 10:51:36 +0000 (10:51 +0000)]
i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE

Allow non-dt kernels to boot

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
12 years agoi.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
Eric Nelson [Mon, 12 Mar 2012 15:04:12 +0000 (15:04 +0000)]
i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG

This is needed to support Freescale-supplied userspaces.

At the moment, both the IPU and VPU libraries provided by Freescale
in the "imx-lib" package contain routines which scrape the system
revision from /proc/cpuinfo. In the VPU library, this information is
used to load the proper firmware, allowing a single binary to be used
across various i.MX processors.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoi.MX28: Enable additional DRAM address bits
Marek Vasut [Sun, 26 Feb 2012 12:15:04 +0000 (12:15 +0000)]
i.MX28: Enable additional DRAM address bits

Enables all fourteen address lines for DRAM

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Marek Vasut <marek.vasut@gmail.com>
12 years agomx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for...
Eric Nelson [Sun, 26 Feb 2012 12:03:15 +0000 (12:03 +0000)]
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for environment

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
12 years agomx31: add "ARM11P power gating" to get_reset_cause
Helmut Raiger [Wed, 15 Feb 2012 22:44:34 +0000 (22:44 +0000)]
mx31: add "ARM11P power gating" to get_reset_cause

Add missing reset reason 7 to get_reset_cause().

Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
12 years agomx31pdk: Fix CONFIG_SYS_MEMTEST_END
Fabio Estevam [Thu, 9 Feb 2012 14:25:07 +0000 (14:25 +0000)]
mx31pdk: Fix CONFIG_SYS_MEMTEST_END

CONFIG_SYS_MEMTEST_END should be higher than CONFIG_SYS_MEMTEST_START.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoefikamx: Fix CONFIG_SYS_MEMTEST_END
Fabio Estevam [Thu, 9 Feb 2012 14:25:11 +0000 (14:25 +0000)]
efikamx: Fix CONFIG_SYS_MEMTEST_END

CONFIG_SYS_MEMTEST_END should be higher than CONFIG_SYS_MEMTEST_START.

Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Marek Vasut <marek.vasut@gmail.com>
12 years agomx53smd: Fix CONFIG_SYS_MEMTEST_END
Fabio Estevam [Thu, 9 Feb 2012 14:25:10 +0000 (14:25 +0000)]
mx53smd: Fix CONFIG_SYS_MEMTEST_END

CONFIG_SYS_MEMTEST_END should be higher than CONFIG_SYS_MEMTEST_START.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx53evk: Fix CONFIG_SYS_MEMTEST_END
Fabio Estevam [Thu, 9 Feb 2012 14:25:09 +0000 (14:25 +0000)]
mx53evk: Fix CONFIG_SYS_MEMTEST_END

CONFIG_SYS_MEMTEST_END should be higher than CONFIG_SYS_MEMTEST_START.

Cc: Jason Liu <r64343@freescale.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx51evk: Fix CONFIG_SYS_MEMTEST_END
Fabio Estevam [Thu, 9 Feb 2012 14:25:08 +0000 (14:25 +0000)]
mx51evk: Fix CONFIG_SYS_MEMTEST_END

CONFIG_SYS_MEMTEST_END should be higher than CONFIG_SYS_MEMTEST_START.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoi.MX6: mx6qsabrelite: add ext2 support
Eric Nelson [Fri, 2 Mar 2012 12:55:09 +0000 (12:55 +0000)]
i.MX6: mx6qsabrelite: add ext2 support

Current Ubuntu releases from Freescale contain a boot script in ext3 filesystem.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
12 years agoimximage: Remove overwriting of flash_offset
Dirk Behme [Wed, 22 Feb 2012 22:50:19 +0000 (22:50 +0000)]
imximage: Remove overwriting of flash_offset

The flash header supports different flash offsets for different
boot devices. E.g. parallel NOR or OneNAND use a different offset
than FLASH_OFFSET_STANDARD (== 0x400).

The flash offset is correctly read from the configuration in
parse_cfg_cmd(). But is then overwritten wrongly in set_imx_hdr_v1/2().

Fix this by removing this overwriting. Use the flash offset
correctly read from the configuration, instead.

If there is no flash_offset read from the configuration file, i.e.
the BOOT_FROM tag is missing, exit with an error message.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Jason Liu <liu.h.jason@gmail.com>
CC: Stefano Babic <sbabic@denx.de>
Tested-by: Stefano Babic <sbabic@denx.de>
12 years agoIXP: Fix GPIO_INT_ACT_LOW_SET()
Marek Vasut [Tue, 6 Mar 2012 10:57:43 +0000 (11:57 +0100)]
IXP: Fix GPIO_INT_ACT_LOW_SET()

The GPIO_INT_ACT_LOW_SET was incorrectly handling interrupt lines higher than 7.
This is due to the fact that there are two registers for total of 16 lines.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoIXP: Fix NAND build warning on PDNB3 and SCPU
Marek Vasut [Tue, 6 Mar 2012 00:10:00 +0000 (01:10 +0100)]
IXP: Fix NAND build warning on PDNB3 and SCPU

nand.c: In function ‘pdnb3_nand_read_buf’:
nand.c:107:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
nand.c: In function ‘pdnb3_nand_dev_ready’:
nand.c:124:18: warning: variable ‘val’ set but not used [-Wunused-but-set-variable]

Remove the 4-byte-at-time read mode altogether, the most is bogus and will
likely cause unaligned accesses.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoIXP: Move PDNB3 and SCPU from Makefile to boards.cfg
Marek Vasut [Tue, 6 Mar 2012 00:02:14 +0000 (01:02 +0100)]
IXP: Move PDNB3 and SCPU from Makefile to boards.cfg

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoIXP: Squash warnings in IXP NPE
Marek Vasut [Tue, 6 Mar 2012 00:00:52 +0000 (01:00 +0100)]
IXP: Squash warnings in IXP NPE

IxEthAcc.c: In function ‘ixEthAccInit’:
IxEthAcc.c:105:21: warning: comparison between ‘IxEthDBStatus’ and ‘enum <anonymous>’ [-Wenum-compare]
IxEthDBAPISupport.c: In function ‘ixEthDBPortAddressSet’:
IxEthDBAPISupport.c:633:18: warning: variable ‘ackPortAddressLock’ set but not used [-Wunused-but-set-variable]
IxQMgrDispatcher.c: In function ‘ixQMgrLLPShow’:
IxQMgrDispatcher.c:1194:18: warning: variable ‘q’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoIXP: Fix missing MACH_TYPE_{ACTUX?,PNB3,DVLHOST}
Marek Vasut [Mon, 5 Mar 2012 23:45:35 +0000 (00:45 +0100)]
IXP: Fix missing MACH_TYPE_{ACTUX?,PNB3,DVLHOST}

These symbols are no longer defined in Linux-ARM's mach-types files. Replace
these with CONFIG_MACH_TYPE instead.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoIXP: Make IXP buildable with arm-linux- toolchains
Marek Vasut [Mon, 5 Mar 2012 23:00:12 +0000 (00:00 +0100)]
IXP: Make IXP buildable with arm-linux- toolchains

Add -EB flag to LD to switch endianness of the linker. This should make armeb
targets buildable again. Also, make use of U-Boot's internal libgcc instead of
toolchain's one, this works around the use of libraries from GCC, which might be
little endian.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoExamples: Properly append LDFLAGS to LD command
Marek Vasut [Mon, 5 Mar 2012 23:44:22 +0000 (00:44 +0100)]
Examples: Properly append LDFLAGS to LD command

The LD command in examples/standalone/Makefile ignored platform specific
LDFLAGS setup. Pass these LDFLAGS to the command.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bryan Hundven <bryanhundven@gmail.com>
Cc: Michael Schwingen <rincewind@discworld.dascon.de>
12 years agoSPL: Enable YMODEM support on BeagleBone and AM335x EVM
Matt Porter [Tue, 31 Jan 2012 12:03:58 +0000 (12:03 +0000)]
SPL: Enable YMODEM support on BeagleBone and AM335x EVM

Cc: Chandan Nath <chandan.nath@ti.com>
Tested-by: Tom Rini <trini@ti.com>
Signed-off-by: Matt Porter <mporter@ti.com>
12 years agoSPL: Add YMODEM over UART load support
Matt Porter [Tue, 31 Jan 2012 12:03:57 +0000 (12:03 +0000)]
SPL: Add YMODEM over UART load support

Adds support for loading U-Boot from UART using YMODEM protocol.
If YMODEM support is enabled in SPL and the romcode indicates
that SPL loaded via UART then SPL will wait for start of a
YMODEM transfer via the console port.

Signed-off-by: Matt Porter <mporter@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agoSPL: Add README.omap3
Tom Rini [Mon, 20 Feb 2012 13:27:43 +0000 (13:27 +0000)]
SPL: Add README.omap3

This document describes the SPL process for OMAP3 (and related) boards
as well as a partial memory map and how to verify certain aspects
outside of running on the target.

Signed-off-by: Tom Rini <trini@ti.com>
12 years agoREADME: document more SPL config options
Tom Rini [Tue, 14 Feb 2012 07:29:40 +0000 (07:29 +0000)]
README: document more SPL config options

Signed-off-by: Tom Rini <trini@ti.com>
12 years agospl.c: Use __noreturn decorator
Tom Rini [Tue, 14 Feb 2012 07:29:39 +0000 (07:29 +0000)]
spl.c: Use __noreturn decorator

Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agoconfig.mk: Check for -fstack-usage support
Tom Rini [Mon, 20 Feb 2012 13:50:10 +0000 (13:50 +0000)]
config.mk: Check for -fstack-usage support

Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agoconfig.mk: Make cc-option create a file under include/generated
Tom Rini [Tue, 14 Feb 2012 07:29:37 +0000 (07:29 +0000)]
config.mk: Make cc-option create a file under include/generated

Testing for -fstack-usage requires the creation of an output file, which
isn't possible with /dev/null.

Signed-off-by: Tom Rini <trini@ti.com>
12 years ago.gitignore: Add .su files
Tom Rini [Tue, 14 Feb 2012 07:29:36 +0000 (07:29 +0000)]
.gitignore: Add .su files

The '-fstack-usage' option to gcc will generate .su files, ignore them.

Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agoFix erroneous 32-bit access to hw_clkctrl_frac0 and hw_clkctrl_frac1 registers
Robert Delien [Sun, 26 Feb 2012 12:15:07 +0000 (12:15 +0000)]
Fix erroneous 32-bit access to hw_clkctrl_frac0 and hw_clkctrl_frac1 registers

This patch fixes erroneous 32-bit access to registers
hw_clkctrl_frac0 and hw_clkctrl_frac1.

Signed-off-by: Robert Delien <robert@delien.nl>
Acked-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
12 years agoIntroducing 8-bit wide register, mx28_register_8
Robert Delien [Sun, 26 Feb 2012 12:15:06 +0000 (12:15 +0000)]
Introducing 8-bit wide register, mx28_register_8

This patch introduces an 8-bit register, mx28_register_8, in order to
prepare for fixing erroneous 32-bit wide access of registers
hw_clkctrl_frac0 and hw_clkctrl_frac1.

Signed-off-by: Robert Delien <robert@delien.nl>
Acked-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
12 years agoRenamed mx28_register to mx28_register_32 to prepare for mx28_register_8
Robert Delien [Sun, 26 Feb 2012 12:15:05 +0000 (12:15 +0000)]
Renamed mx28_register to mx28_register_32 to prepare for mx28_register_8

This patch renames mx28_register to mx28_register_32 in order to
prepare for the introduction of an 8-bit register, mx28_register_8.

Signed-off-by: Robert Delien <robert@delien.nl>
Acked-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
12 years agoi.MX28: Reformat the DRAM memory configuration data
Marek Vasut [Sun, 26 Feb 2012 12:15:03 +0000 (12:15 +0000)]
i.MX28: Reformat the DRAM memory configuration data

Reformat the data so it's easier to navigate through them.

Signed-off-by: Marek Vasut <marex@denx.de>
12 years agoM28: Support for the old M28 SoM v1.0
Marek Vasut [Sun, 26 Feb 2012 12:15:02 +0000 (12:15 +0000)]
M28: Support for the old M28 SoM v1.0

This prototype version SoM is unused and not available to public.
Support this only for internal debugging purposes.

Signed-off-by: Marek Vasut <marex@denx.de>
12 years agoM28: Fix LCD PINMUX
Marek Vasut [Sun, 26 Feb 2012 12:15:01 +0000 (12:15 +0000)]
M28: Fix LCD PINMUX

The LCD pins configuration was wrong in U-Boot, configure pins properly.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
12 years agomx6qsabrelite: add and enable USB Host 1 support
Wolfgang Grandegger [Wed, 8 Feb 2012 22:33:26 +0000 (22:33 +0000)]
mx6qsabrelite: add and enable USB Host 1 support

Cc: Stefano Babic <sbabic@denx.de>
Cc: Jason Liu <jason.hui@linaro.org>
Signed-off-by: Wolfgang Grandegger <wg@denx.de>
12 years agousb/ehci: Add USB support for the MX6Q
Wolfgang Grandegger [Wed, 8 Feb 2012 22:33:25 +0000 (22:33 +0000)]
usb/ehci: Add USB support for the MX6Q

Currently, only USB Host 1 is supported.

Cc: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Wolfgang Grandegger <wg@denx.de>
12 years agomx6q: mx6qsabrelite: Update the README
Dirk Behme [Sun, 12 Feb 2012 21:29:47 +0000 (21:29 +0000)]
mx6q: mx6qsabrelite: Update the README

The SD loader binary is now downloadable at

https://wiki.linaro.org/Boards/MX6QSabreLite

under a open-source 3-clause BSD license. Update the README
for this.

The discussion shows that it's hard to change the hardware
regarding the default SPI NOR boot of the SabreLite boards.
I.e. this will stay the default boot. Therefore remove the
'early version of' statement.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Jason Liu <liu.h.jason@gmail.com>
12 years agoi.mx28: Replaced magic numbers for scratch register addresses with register definitions
Robert Delien [Tue, 7 Feb 2012 04:08:56 +0000 (04:08 +0000)]
i.mx28: Replaced magic numbers for scratch register addresses with register definitions

This patch replaces the use of magice numbers for scratch register
addresses with earlier defined register definitions.

Signed-off-by: Robert Delien <robert@delien.nl>
12 years agoi.mx28: Added register definitions for DIGCTL registers
Robert Delien [Tue, 7 Feb 2012 04:08:55 +0000 (04:08 +0000)]
i.mx28: Added register definitions for DIGCTL registers

This patch adds register definitions for the registers of the DIGCTL
IP-block.

Signed-off-by: Robert Delien <robert@delien.nl>
12 years agoPXA: Fix missing get_tbclk() breaking vpac boards
Marek Vasut [Mon, 27 Feb 2012 12:59:47 +0000 (13:59 +0100)]
PXA: Fix missing get_tbclk() breaking vpac boards

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Fix warning in zipitz2
Marek Vasut [Mon, 27 Feb 2012 11:56:39 +0000 (12:56 +0100)]
PXA: Fix warning in zipitz2

Configuring for zipitz2 board...
zipitz2.c: In function ‘board_mmc_init’:
zipitz2.c:85:2: warning: implicit declaration of function ‘pxa_mmc_register’ [-Wimplicit-function-declaration]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoarm: Remove jornada link script
Simon Glass [Mon, 21 Nov 2011 10:49:38 +0000 (10:49 +0000)]
arm: Remove jornada link script

This link script seems old and incompatible with relocation and its
own sa1000 start.S file. It isn't used because the CPU's link script
was picked up in preference to this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
12 years agoPXA: Remove PXA PCMCIA support
Marek Vasut [Mon, 13 Feb 2012 08:05:16 +0000 (09:05 +0100)]
PXA: Remove PXA PCMCIA support

Say good bye to some ancient, very broken and unused code.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agozipitz2: use pxa_mmc_gen as MMC driver
Vasily Khoruzhick [Wed, 25 Jan 2012 19:54:33 +0000 (22:54 +0300)]
zipitz2: use pxa_mmc_gen as MMC driver

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years agozipitz2: fix boot issue introduced by PXA low level init rework
Vasily Khoruzhick [Fri, 13 Jan 2012 07:11:44 +0000 (10:11 +0300)]
zipitz2: fix boot issue introduced by PXA low level init rework

CONFIG_SYS_INIT_SP_ADDR points to RAM, but it's used before
DRAM controller init. Fix it by setting CONFIG_SYS_INIT_SP_ADDR
to SRAM

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Fri, 23 Mar 2012 20:59:16 +0000 (21:59 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

* 'master' of git://git.denx.de/u-boot-cfi-flash:
  cfi: fix the incomplete erased status check in buffer write

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-nds32
Wolfgang Denk [Fri, 23 Mar 2012 20:57:50 +0000 (21:57 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/n1213: correct vector table in start.S
  nds32: fix ptrace and interrupt register overflow

12 years agoRevert "Add board_pre_console_putc to deal with early console output"
Simon Glass [Tue, 20 Mar 2012 04:59:14 +0000 (21:59 -0700)]
Revert "Add board_pre_console_putc to deal with early console output"

This reverts commit 295d3942b806552503243f5cfb36aec6f1b5a9bf.

It turns that this really doesn't work very nicely. Instead we should
have a pre-console panic function so that we know that further execution
is impossible and we don't need to worry about trampling on UARTs, etc.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agocfi: fix the incomplete erased status check in buffer write
Tao Hou [Thu, 15 Mar 2012 15:33:58 +0000 (23:33 +0800)]
cfi: fix the incomplete erased status check in buffer write

Without the fix, flash_write_cfibuffer will terminate the erased
status check once an all-0xFF word has been found instead of
continuing the erased status check utill the first non-0xFF word.

Signed-off-by: Tao Hou <hotforest@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoETX094: adjust linker script due to grown code size
Wolfgang Denk [Mon, 19 Mar 2012 08:32:12 +0000 (09:32 +0100)]
ETX094: adjust linker script due to grown code size

Recent bootstage commits made the code grow, which caused linker
errors.  Adjust the linker script to fix that.

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agonds32/n1213: correct vector table in start.S
Macpaul Lin [Sun, 11 Mar 2012 08:53:23 +0000 (16:53 +0800)]
nds32/n1213: correct vector table in start.S

Correct definition of vector table in start.S

Signed-off-by: Macpaul Lin <macpaul@gmail.com>
12 years agonds32: fix ptrace and interrupt register overflow
Macpaul Lin [Sun, 11 Mar 2012 08:30:18 +0000 (16:30 +0800)]
nds32: fix ptrace and interrupt register overflow

Fix ptrace and interrupt register overflow warning.
Add missing P0 and P1 (r26 and r27) into register lists.
These register are usually used in OS.

Signed-off-by: Macpaul Lin <macpaul@gmail.com>
12 years agoArmada100: gplugD: Add FAT & EXT2 command support
Ajay Bhargav [Mon, 13 Feb 2012 03:30:38 +0000 (03:30 +0000)]
Armada100: gplugD: Add FAT & EXT2 command support

This patch adds FAT and ext2 command support for marvell gplugD

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
12 years agoArmada100: gplugD: Add USB command support
Ajay Bhargav [Mon, 13 Feb 2012 03:27:44 +0000 (03:27 +0000)]
Armada100: gplugD: Add USB command support

This patch adds support for USB commands and USB storage device for
Marvell gplugD

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
12 years agoUSB: Armada100: EHCI Driver for Armada100 SOCs
Ajay Bhargav [Mon, 13 Feb 2012 03:27:43 +0000 (03:27 +0000)]
USB: Armada100: EHCI Driver for Armada100 SOCs

This patch adds support for USB EHCI driver for Armada100 SOCs.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
12 years agoUSB: Armada100: Add UTMI PHY interface driver
Ajay Bhargav [Mon, 13 Feb 2012 03:27:42 +0000 (03:27 +0000)]
USB: Armada100: Add UTMI PHY interface driver

This patch adds USB host controller's UTMI PHY interface driver for
Armada100 SOCs.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
12 years agogit-mailrc: change usb maintainer to Marek
Mike Frysinger [Mon, 5 Mar 2012 15:15:25 +0000 (15:15 +0000)]
git-mailrc: change usb maintainer to Marek

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agousb:udc:samsung:fix Remove the req_config flag
Łukasz Majewski [Mon, 12 Mar 2012 22:08:06 +0000 (22:08 +0000)]
usb:udc:samsung:fix Remove the req_config flag

The dev->req_config flag was indicating that the forwarded
request needs to perform the usb gadget delayed status.
This is however not needed anymore, so it can be removed.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
12 years agoUSB:gadget:designware Fix memory nonalignment issue
Shiraz Hashim [Tue, 6 Mar 2012 23:39:41 +0000 (23:39 +0000)]
USB:gadget:designware Fix memory nonalignment issue

While receiving packets from FIFO sometimes the buffer provided was
nonaligned. Fix this by taking a temporary aligned buffer and then
copying the content to nonaligned buffer.

Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agoUSB:gadget:designware Make locally used functions static
Amit Virdi [Tue, 6 Mar 2012 23:39:40 +0000 (23:39 +0000)]
USB:gadget:designware Make locally used functions static

Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agoUSB:gadget:designware Support high speed
Vipin KUMAR [Tue, 6 Mar 2012 23:39:39 +0000 (23:39 +0000)]
USB:gadget:designware Support high speed

This patch adds the support for usb device high speed for designware peripheral.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agoUSB:gadget:designware Device controller bugfixes
Vipin KUMAR [Tue, 6 Mar 2012 23:39:38 +0000 (23:39 +0000)]
USB:gadget:designware Device controller bugfixes

This patch fixes a few bugs in USB device controller driver.
The fixes are as follows
1. Adding error condition checks eg. NULL return
2. Endpoint other than endpoint 0 (control endpoint) are initialized
only if usb state machine reaches STATE_ADDRESSED or above
3. Zero length packet handling corrected
4. Dead code removed
5. Bulk out endpoint returns after servicing 1 interrupt and returns
back to service if more interrupts are pending

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoUSB:gadget:designware USB device controller (UDC) implementation
Vipin KUMAR [Tue, 6 Mar 2012 23:39:37 +0000 (23:39 +0000)]
USB:gadget:designware USB device controller (UDC) implementation

The earlier usb device controller driver was specific to spear platforms. This
patch implements the usb device controller driver as a generic controller which
can be reused by other platforms using this peripheral.

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
Acked-by: Marek Vasut <marex@denx.de>
12 years agousb: replace wait_ms() with mdelay()
Mike Frysinger [Mon, 5 Mar 2012 13:47:00 +0000 (13:47 +0000)]
usb: replace wait_ms() with mdelay()

Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func.  This also fixes the build errors:

ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
12 years agousb: musb: fix printf warning
Mike Frysinger [Fri, 3 Feb 2012 03:03:04 +0000 (03:03 +0000)]
usb: musb: fix printf warning

musb_hcd.c: In function 'musb_submit_rh_msg':
musb_hcd.c:827:2: warning: format '%d' expects type 'int',
but argument 3 has type 'long unsigned int'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agobootstage: arm: Add bootstage calls in board and bootm
Simon Glass [Mon, 13 Feb 2012 13:51:21 +0000 (13:51 +0000)]
bootstage: arm: Add bootstage calls in board and bootm

Add calls to bootstage before and after relocation, and just
before jumping to the OS.

The idea here is you can call bootstage_report() to get a report.
Additionally, if you define CONFIG_BOOTSTAGE_REPORT then a report is
printed automatically by U-Boot just before jumping to the kernel.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Plumb in bootstage calls for basic operations
Simon Glass [Sat, 10 Dec 2011 11:08:06 +0000 (11:08 +0000)]
bootstage: Plumb in bootstage calls for basic operations

This inserts bootstage calls into tftp, usb start and bootm. We
could go further, but this is a reasonable start to illustrate
the concept.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Implement core microsecond boot time measurement
Simon Glass [Mon, 13 Feb 2012 13:51:19 +0000 (13:51 +0000)]
bootstage: Implement core microsecond boot time measurement

This defines the basics of a new boot time measurement feature. This allows
logging of very accurate time measurements as the boot proceeds, by using
an available microsecond counter.

To enable the feature, define CONFIG_BOOTSTAGE in your board config file.
Also available is CONFIG_BOOTSTAGE_REPORT which will cause a report to be
printed just before handing off to the OS.

Most IDs are not named at this stage. For that I would first like to
renumber them all.

Timer summary in microseconds:
       Mark    Elapsed  Stage
          0          0  reset
    205,000    205,000  board_init_f
  6,053,000  5,848,000  bootm_start
  6,053,000          0  id=1
  6,058,000      5,000  id=101
  6,058,000          0  id=100
  6,061,000      3,000  id=103
  6,064,000      3,000  id=104
  6,093,000     29,000  id=107
  6,093,000          0  id=106
  6,093,000          0  id=105
  6,093,000          0  id=108
  7,089,000    996,000  id=7
  7,089,000          0  id=15
  7,089,000          0  id=8
  7,097,000      8,000  start_kernel

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Replace show_boot_progress/error() with bootstage_...()
Simon Glass [Mon, 13 Feb 2012 13:51:18 +0000 (13:51 +0000)]
bootstage: Replace show_boot_progress/error() with bootstage_...()

These calls should not be made directly any more, since bootstage
will call the show_boot_...() functions as needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Define an optional microsecond timer
Simon Glass [Sat, 10 Dec 2011 11:08:03 +0000 (11:08 +0000)]
bootstage: Define an optional microsecond timer

Define timer_get_boot_us() which returns the number of microseconds
since boot. If undefined then we use get_timer() * 1000.

We can fit this in a 32-bit register which keeps everyone happy on
the efficiency side. It will wrap around after about an hour. If we
are still looking at it after an hour then we had better not be
timing the boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert FIT progress numbers to enums
Simon Glass [Sat, 10 Dec 2011 11:08:02 +0000 (11:08 +0000)]
bootstage: Convert FIT progress numbers to enums

This changes over all the FIT image progress numbers to use enums
from bootstage.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert net progress numbers to enums
Simon Glass [Sat, 14 Jan 2012 15:24:52 +0000 (15:24 +0000)]
bootstage: Convert net progress numbers to enums

This changes over the network-related progress numbers to use enums
from bootstage.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert NAND progress numbers to enums
Simon Glass [Sat, 10 Dec 2011 11:08:00 +0000 (11:08 +0000)]
bootstage: Convert NAND progress numbers to enums

This changes over the NAND progress numbers to use enums from
bootstage.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert IDE progress numbers to enums
Simon Glass [Sat, 10 Dec 2011 11:07:59 +0000 (11:07 +0000)]
bootstage: Convert IDE progress numbers to enums

This changes over the IDE progress numbers to use enums from bootstage.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert progress numbers 20-41 to enums
Simon Glass [Sat, 10 Dec 2011 11:07:58 +0000 (11:07 +0000)]
bootstage: Convert progress numbers 20-41 to enums

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Convert progress numbers 10-19 to enums
Simon Glass [Sat, 10 Dec 2011 11:07:57 +0000 (11:07 +0000)]
bootstage: Convert progress numbers 10-19 to enums

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agobootstage: Convert progress numbers 1-9 into enums
Simon Glass [Sat, 14 Jan 2012 15:24:47 +0000 (15:24 +0000)]
bootstage: Convert progress numbers 1-9 into enums

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootstage: Use show_boot_error() for -ve progress numbers
Simon Glass [Sat, 10 Dec 2011 11:07:55 +0000 (11:07 +0000)]
bootstage: Use show_boot_error() for -ve progress numbers

Rather than the caller negating our progress numbers to indicate an
error has occurred, which seems hacky, add a function to indicate this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agobootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress()
Simon Glass [Sat, 10 Dec 2011 11:07:54 +0000 (11:07 +0000)]
bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress()

This changes the number 15 as used in boot_stage_progress() to use the
new name provided for it. This is a separate patch because it touches
so many files.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agobootstage: Create an initial header for boot progress integers
Simon Glass [Sat, 14 Jan 2012 15:24:44 +0000 (15:24 +0000)]
bootstage: Create an initial header for boot progress integers

At present boot_stage_progress() is called with various magic numbers. The
new bootstage.h header will be used to turn these into symbolic names
throughout the code.

The intent is not that these numbers are passed to Linux. In fact by using
an enum to track them we should eventually be able to remove the explict
numbers and just have the stages count up from 0.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agobootvx: Clear and disable data cache, and call vxWorks with parameter.
Reinhard Arlt [Fri, 18 Nov 2011 09:06:52 +0000 (09:06 +0000)]
bootvx: Clear and disable data cache, and call vxWorks with parameter.

This patch clear and disable the data cache for vxWorks.

The entry point sysInit(int) intended by Windriver to be called from
the vxWorks bootrom, a very small vxWorks system.
The routine is called by the go() handler in the bootrom, that clears
the cache from start of image to end of usable memory.

The PowerPC implementations only invalidates and disable the cache,
the ARM implementations also flush it.

U-Boot will be on the safe side, if it disables the data cache before
calling vxWorks sysInit(int).

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
12 years agonet/miiphy/serial: drop duplicate "NAMESIZE" define
Mike Frysinger [Thu, 10 Nov 2011 14:11:04 +0000 (14:11 +0000)]
net/miiphy/serial: drop duplicate "NAMESIZE" define

A few subsystems are using the same define "NAMESIZE".  This has been
working so far because they define it to the same number.  However, I
want to change the size of eth_device's NAMESIZE, so rather than tweak
the define names, simply drop references to it.  Almost no one does,
and the handful that do can easily be changed to a sizeof().

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoCPCI750: Add CPCI-HD/2 support
Reinhard Arlt [Thu, 10 Nov 2011 08:51:57 +0000 (08:51 +0000)]
CPCI750: Add CPCI-HD/2 support

This patch adds support for the esd CPCI-HD/2 board to u-boot for CPCI-CPU/750.
As the primary devices on the CPCI-HD/2 board are connected to device 1 and 3,
the device must be swapped.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-avr32
Wolfgang Denk [Sat, 17 Mar 2012 20:50:59 +0000 (21:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-avr32

* 'master' of git://git.denx.de/u-boot-avr32:
  atmel_mci.h: remove outdated register macros
  doc/git-mailrc: add <me> to avr32 alias
  ATMEL: remove old atmel_mci driver
  ATMEL: use generic mmc framework

12 years agoMerge branch 'sandbox' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sat, 17 Mar 2012 20:46:33 +0000 (21:46 +0100)]
Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin

* 'sandbox' of git://git.denx.de/u-boot-blackfin:
  sandbox: mark os_exit as noreturn
  sandbox: add getopt support
  sandbox: allow processing before main loop
  sandbox: add concept of sandbox state
  sandbox: disable fortification
  sandbox: u-boot.lds: tweak style
  sandbox: add get_{tbclk,ticks}
  sandbox: enable GPIO driver
  sandbox: gpio: add basic driver for simulating GPIOs
  sandbox: add flags for open() call
  sandbox: config: enable fdt and snprintf() options
  sandbox: fdt: add support for CONFIG_OF_CONTROL
  sandbox: add lseek helper
  sandbox: add ifdef protection to os.h
  sandbox: add required header to os.c
  sandbox: sort header files in os.c