oweals/u-boot.git
14 years agoMerge branch 'next' of git://git.denx.de/u-boot-video into next
Wolfgang Denk [Thu, 17 Jun 2010 20:53:03 +0000 (22:53 +0200)]
Merge branch 'next' of git://git.denx.de/u-boot-video into next

14 years agoMerge branch 'next' of git://git.denx.de/u-boot-pxa into next
Wolfgang Denk [Thu, 17 Jun 2010 20:39:03 +0000 (22:39 +0200)]
Merge branch 'next' of git://git.denx.de/u-boot-pxa into next

14 years agovideo: sm501.c: add weak default functions
Anatolij Gustschin [Wed, 26 May 2010 08:38:58 +0000 (10:38 +0200)]
video: sm501.c: add weak default functions

For boards using sm501/sm502 on PCI bus some driver
functions normaly defined in the board code are not
needed and empty. Provide weak default functions for
them and do not enforce board code to define empty
functions.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agovideo: sm501: add support for SM501 chips on PCI bus
Anatolij Gustschin [Wed, 26 May 2010 08:38:57 +0000 (10:38 +0200)]
video: sm501: add support for SM501 chips on PCI bus

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agovideo: cfb_console: add weak default video_set_lut()
Anatolij Gustschin [Sat, 1 May 2010 20:21:09 +0000 (22:21 +0200)]
video: cfb_console: add weak default video_set_lut()

Do not enforce drivers to provide empty video_set_lut()
if they do not implement indexed color (8 bpp) frame
buffer support. Add default function to the cfb_console
driver and remove empty video_set_lut() functions.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agoMakefile/mkconfig: read simple board configurations from boards.cfg
Wolfgang Denk [Thu, 27 May 2010 21:18:36 +0000 (23:18 +0200)]
Makefile/mkconfig: read simple board configurations from boards.cfg

Instead of adding explicit build rules for each and every board to the
top level Makefile (which makes it grow and grow), we now provide a
simple default rule and extend the "mkconfig" script to read board
configurations from a plain text file (table), "boards.cfg".

For simple boards it is now sufficient to add a single line of text to
the "boards.cfg" file, no changes to the top level Makefile are needed
any more.

To make the table better readable, change the notation for unused
fields from "NULL" into "-".

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Mike Frysinger <vapier@gentoo.org>
14 years agoMakefile: simplify handling of common board configurations
Wolfgang Denk [Thu, 27 May 2010 21:18:35 +0000 (23:18 +0200)]
Makefile: simplify handling of common board configurations

Many boards don't need any special handling in the Makefile. Try and
provide as generic make rules for these as possible.  There are still
many areas where this does not work out really well, but the changes
show the direction we should take, and point out which boards or
architectures need further cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMakefile: simplify handling of build target names
Wolfgang Denk [Thu, 27 May 2010 21:18:34 +0000 (23:18 +0200)]
Makefile: simplify handling of build target names

Instead of stripping the "_config" part from the make target names in
each call of the "mkconfig" script let this script strip the string.

This prepares the ground for forther simplification of the top level
Makefile.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoFix printing of make targets, simplify Makefile
Wolfgang Denk [Thu, 27 May 2010 21:18:33 +0000 (23:18 +0200)]
Fix printing of make targets, simplify Makefile

Make printing the "board names" more useful. So far, we would get
output like this;

$ ./MAKEALL P2020RDB P2020RDB_NAND P2020RDB_SDCARD P2020RDB_SPIFLASH
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 342612   32656  265212  640480   9c5e0 /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 343160   32704  265212  641076   9c834 /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot
Configuring for P1_P2_RDB board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot

For all build targets the same board name would be printed, which
makes is often pretty difficult to find out which exact build target
caused problems. With this commit, the real make target name gets
printed instead, which is way more useful:

$ ./MAKEALL P2020RDB P2020RDB_NAND P2020RDB_SDCARD P2020RDB_SPIFLASH
Configuring for P2020RDB board...
   text    data     bss     dec     hex filename
 342612   32656  265212  640480   9c5e0 /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_NAND board...
   text    data     bss     dec     hex filename
 343160   32704  265212  641076   9c834 /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_SDCARD board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot
Configuring for P2020RDB_SPIFLASH board...
   text    data     bss     dec     hex filename
 341908   32620  265212  639740   9c2fc /work/wd/tmp-ppc/u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Tested-by: Thomas Chou <thomas@wytron.com.tw>
14 years agoPrepare v2010-rc2 v2010.06-rc2
Wolfgang Denk [Sun, 13 Jun 2010 15:48:15 +0000 (17:48 +0200)]
Prepare v2010-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoPXA: Add missing MDREFR bits
Marek Vasut [Fri, 16 Apr 2010 22:35:52 +0000 (00:35 +0200)]
PXA: Add missing MDREFR bits

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
14 years agoPXA: Add UP2OCR register bit definitions
Marek Vasut [Fri, 16 Apr 2010 20:25:14 +0000 (22:25 +0200)]
PXA: Add UP2OCR register bit definitions

This register is used on PXA to control the USB Port2 operation (USB Port2 is
the host port).

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
14 years agoPXA: PXAMMC: Add Monahans support
Marek Vasut [Tue, 13 Oct 2009 22:25:33 +0000 (00:25 +0200)]
PXA: PXAMMC: Add Monahans support

This patch enables PXAMCI support on PXA3xx CPUs. This patch only enables MMC1
though, MMC2 and PXA31x MMC3 will need further patch to be operational.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
14 years agoPXA: PXAMMC: Drop different delays for PXA27X
Marek Vasut [Mon, 5 Apr 2010 00:28:14 +0000 (02:28 +0200)]
PXA: PXAMMC: Drop different delays for PXA27X

In case the delays were set to 10000, the MMC card on PXA27X boards (and PXA3xx
boards) didn't initialize on first try. Increasing the delays and leaving just
those for PXA25x and 26x (that is 200000) fixes this problem.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
14 years agoUpdate SICRL_USBDR to reflect 4 different settings
Ron Madrid [Wed, 2 Jun 2010 00:00:49 +0000 (17:00 -0700)]
Update SICRL_USBDR to reflect 4 different settings

This patch changed the SICRL_USBDR define to reflect the 4 different bit
settings for this two-bit field.  The four different options are '00', '01',
'10', and '11'.  This patch also corrects the config file for SIMPC8313 and
MPC8313ERDB for the appropriate fields.  This change only affects the MPC8313
cpu.

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 30 May 2010 19:44:07 +0000 (21:44 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sun, 30 May 2010 19:43:05 +0000 (21:43 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

14 years agofdt_support: add entry for sec3.1 and fix sec3.3
Kim Phillips [Fri, 23 Apr 2010 17:20:11 +0000 (12:20 -0500)]
fdt_support: add entry for sec3.1 and fix sec3.3

Add sec3.1 h/w geometry for fdt node fixups.

Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor
type, it lacks the ARC4 algorithm execution unit required to be able
to execute anything meaningful with it.  Change the node to agree with
the documentation that declares that the sec3.3 really doesn't have such
a descriptor type.

Reported-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl: rename 'dma' to 'brdcfg1' in the ngPIXIS structure
Timur Tabi [Thu, 20 May 2010 16:16:16 +0000 (11:16 -0500)]
fsl: rename 'dma' to 'brdcfg1' in the ngPIXIS structure

The ngPIXIS is a board-specific FPGA, but the definition of the registers
is mostly consistent.  On boards where it matter, register 9 is called
'brdcfg1' instead of 'dma', so rename the variable in the ngpixis_t
definition.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition
Timur Tabi [Thu, 20 May 2010 17:45:39 +0000 (12:45 -0500)]
fsl/85xx: add clkdvdr and pmuxcr2 to global utilities structure definition

Add the 'clkdvdr' and 'pmuxcr2' registers to the 85xx definition of
struct ccsr_gur.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoMerge branch 'next' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Fri, 28 May 2010 18:34:39 +0000 (20:34 +0200)]
Merge branch 'next' of git://git.denx.de/u-boot-nios

14 years agoARM Update mach-types
Tom [Fri, 28 May 2010 18:23:16 +0000 (13:23 -0500)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 3defb2476166445982a90c12d33f8947e75476c4

Signed-off-by: Tom <Tom@bumblecow.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-coldfire
Wolfgang Denk [Fri, 28 May 2010 17:49:12 +0000 (19:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-coldfire

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Fri, 28 May 2010 17:47:15 +0000 (19:47 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

14 years agoARM Update mach-types
Tom [Sun, 9 May 2010 21:58:11 +0000 (16:58 -0500)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit 257dab81413b31b8648becfe11586b3a41e5c29a

Signed-off-by: Tom <Tom@bumblecow.com>
14 years agonios: remove nios-32 arch
Thomas Chou [Fri, 28 May 2010 02:56:50 +0000 (10:56 +0800)]
nios: remove nios-32 arch

The nios-32 arch is obsolete and broken. So it is removed.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
14 years agonios2: allow STANDALONE_LOAD_ADDR overriding
Thomas Chou [Fri, 21 May 2010 03:08:02 +0000 (11:08 +0800)]
nios2: allow STANDALONE_LOAD_ADDR overriding

This patch allows users to override default STANDALONE_LOAD_ADDR.
The gcclibdir path was duplicated in the standalone Makefile and
can be removed.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: fix div64 issue for gcc4
Thomas Chou [Fri, 14 May 2010 22:00:05 +0000 (06:00 +0800)]
nios2: fix div64 issue for gcc4

This patch fixes the run-time error on div64 when built with
gcc4, which was reported by jhwu0625 on nios forum. It merges
math support from libgcc of gcc4. This patch is copied from
nios2-linux.

It works with both gcc3 and gcc4. The old mult.c, divmod.c and
math.h are removed.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: fix r15 issue for gcc4
Thomas Chou [Fri, 21 May 2010 03:08:03 +0000 (11:08 +0800)]
nios2: fix r15 issue for gcc4

The "-ffixed-r15" option doesn't work well for gcc4. Since we
don't use gp for small data with option "-G0", we can use gp
as global data pointer. This allows compiler to use r15. It
is necessary for gcc4 to work properly.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agospi: add altera spi controller support
Thomas Chou [Fri, 30 Apr 2010 03:34:16 +0000 (11:34 +0800)]
spi: add altera spi controller support

This patch adds the driver of altera spi controller, which is
used as epcs/spi flash controller. It also works with mmc_spi
driver.

This driver support more than one spi bus, with base list declared
#define CONFIG_SYS_ALTERA_SPI_LIST { BASE_0,BASE_1,... }

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Tested-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: add gpio support to nios2-generic board
Thomas Chou [Fri, 30 Apr 2010 03:34:15 +0000 (11:34 +0800)]
nios2: add gpio support to nios2-generic board

This patch adds gpio support of Altera PIO component to the
nios2-generic board. Though it drives only gpio_led at the
moment, it supports bidirectional port to control bit-banging
I2C, NAND flash busy status or button switches, etc.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Tested-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agomisc: add gpio based status led driver
Thomas Chou [Fri, 30 Apr 2010 03:34:14 +0000 (11:34 +0800)]
misc: add gpio based status led driver

This patch adds a status led driver followed the GPIO access
conventions of Linux. The led mask is used to specify the gpio pin.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Tested-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agonios2: add gpio support
Thomas Chou [Fri, 30 Apr 2010 03:34:13 +0000 (11:34 +0800)]
nios2: add gpio support

This patch adds driver for a trivial gpio core, which is described
in http://nioswiki.com/GPIO. It is used for gpio led and nand flash
interface in u-boot.

When CONFIG_SYS_GPIO_BASE is not defined, board may provide
its own driver.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Tested-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
14 years agoadd CONFIG_SYS_FEC_FULL_MII for MCF5445x
Wolfgang Wegner [Tue, 30 Mar 2010 18:19:51 +0000 (19:19 +0100)]
add CONFIG_SYS_FEC_FULL_MII for MCF5445x

This patch adds support for full MII interface on MCF5445x (in contrast
to RMII as used on the evaluation boards).

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agoadd CONFIG_SYS_FEC_NO_SHARED_PHY for MCF5445x
Wolfgang Wegner [Tue, 30 Mar 2010 18:19:50 +0000 (19:19 +0100)]
add CONFIG_SYS_FEC_NO_SHARED_PHY for MCF5445x

This patch adds the possibility to handle seperate PHYs to MCF5445x.
Naming is chosen to resemble the contrary CONFIG_FEC_SHARED_PHY in the
linux kernel.

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agoadd missing PCS3 for MCF5445x
Wolfgang Wegner [Tue, 30 Mar 2010 18:20:31 +0000 (19:20 +0100)]
add missing PCS3 for MCF5445x

This patch adds the code for handling PCS3 (DSPI chip select 3) in
cpu_init.c and m5445x.h

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agoUSB: fix create_pipe()
Sergei Shtylyov [Wed, 26 May 2010 17:26:43 +0000 (21:26 +0400)]
USB: fix create_pipe()

create_pipe() can give wrong result if an expression is passed as the 'endpoint'
argument -- due to missing parentheses.

Thanks to Martin Mueller for finding the bug and providing the patch.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
14 years agoBlackfin: nand: drain the write buffer before returning
Andrew Caldwell [Fri, 7 May 2010 19:10:07 +0000 (15:10 -0400)]
Blackfin: nand: drain the write buffer before returning

The current Blackfin nand write function fills up the write buffer but
returns before it has had a chance to drain.  On faster systems, this
isn't a problem as the operation finishes before the ECC registers are
read, but on slower systems the ECC may be incomplete when the core tries
to read it.

So wait for the buffer to drain once we're done writing to it.

Signed-off-by: Andrew Caldwell <Andrew.Caldwell@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoPrepare v2010.06-rc1 v2010.06-rc1
Wolfgang Denk [Wed, 26 May 2010 21:57:08 +0000 (23:57 +0200)]
Prepare v2010.06-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoCoding style cleanup, update CHANGELOG.
Wolfgang Denk [Wed, 26 May 2010 21:51:22 +0000 (23:51 +0200)]
Coding style cleanup, update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Wed, 26 May 2010 20:36:32 +0000 (22:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agoconfig.mk: use different host compiler for OS X 10.6
Andreas Biessmann [Sat, 22 May 2010 11:17:21 +0000 (13:17 +0200)]
config.mk: use different host compiler for OS X 10.6

Compiling tools subdirectory on Mac OS X 10.6 (Snow Leopard) complains about
wrong syntax in system includes.

In file included from /usr/include/stdio.h:444,
                 from ../source/u-boot/include/compiler.h:26,
                 from ../source/u-boot/lib/crc32.c:15:
/usr/include/secure/_stdio.h:46: error: syntax error in macro parameter list

This can be fixed by reverting the workaround for prior OS X releases in
config.mk conditionally for OS X 10.6+.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
14 years agoConvert Makefiles from COBJS-${} to COBJS-$()
Kumar Gala [Fri, 21 May 2010 09:17:48 +0000 (04:17 -0500)]
Convert Makefiles from COBJS-${} to COBJS-$()

Match style we use almost everywhere else

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agopowerpc/bootcount: Fix endianness problem
Michael Weiss [Thu, 20 May 2010 14:09:35 +0000 (16:09 +0200)]
powerpc/bootcount: Fix endianness problem

For CONFIG_SYS_BOOTCOUNT_SINGLEWORD the code had an endianness problem.

Signed-off-by: Michael Weiss <michael.weiss@ifm.com>
Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agodm9000x.c: fix compile problems
Wolfgang Denk [Wed, 26 May 2010 20:19:35 +0000 (22:19 +0200)]
dm9000x.c: fix compile problems

Use readX() / writeX() accessors instead of inX() / outX().

Suggested-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoa320evb: fix udelay / __udelay confusion
Wolfgang Denk [Fri, 21 May 2010 21:14:53 +0000 (23:14 +0200)]
a320evb: fix udelay / __udelay confusion

Fix the following compiler problems:

arch/arm/cpu/arm920t/a320/liba320.a(timer.o): In function `udelay':
/home/wd/git/u-boot/work/arch/arm/cpu/arm920t/a320/timer.c:160: multiple definition of `udelay'
lib/libgeneric.a(time.o):/home/wd/git/u-boot/work/lib/time.c:34: first defined here
lib/libgeneric.a(time.o): In function `udelay':
time.c:(.text+0x1c): undefined reference to `__udelay'

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoARM: */timer.c: fix spelling and vertical alignment
Wolfgang Denk [Fri, 21 May 2010 21:13:18 +0000 (23:13 +0200)]
ARM: */timer.c: fix spelling and vertical alignment

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agobugfix: Guruplug: Use standard miiphy
Mahavir Jain [Fri, 21 May 2010 09:07:48 +0000 (14:37 +0530)]
bugfix: Guruplug: Use standard miiphy

call to reset PHY chip.

Current PHY Software Reset operation in guruplug does not
poll reset bit in control register to go to 0(auto clearing)
for making sure reset was successful.This patch uses standard
miiphy call miiphy_reset to make sure proper PHY reset operation.

Signed-off-by: Mahavir Jain <mjain@marvell.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Fri, 21 May 2010 20:26:14 +0000 (22:26 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

14 years agompc83xx: don't shift pre-shifted ACR, SPCR, SCCR bitfield masks in cpu_init.c
Kim Phillips [Wed, 19 May 2010 22:06:46 +0000 (17:06 -0500)]
mpc83xx: don't shift pre-shifted ACR, SPCR, SCCR bitfield masks in cpu_init.c

commit c7190f028fa950d4d36b6d0b4bb3fc72602ec54c "mpc83xx:
retain POR values of non-configured ACR, SPCR, SCCR, and LCRR
bitfields" incorrectly shifted <register>_<bitfield> (e.g.
ACR_PIPE_DEP) values that were preshifted by their
definition in mpc83xx.h.

this patch removes the unnecessary shifting for the newly
utilized mask values in cpu_init.c, and prevents seemingly
unrelated symptoms such as an mpc8379erdb board from
locking up whilst performing a networking operation,
e.g. a tftp.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoFixed two typos in arch/powerpc/cpu/mpc83xx/start.S.
Horst Kronstorfer [Tue, 18 May 2010 08:37:05 +0000 (10:37 +0200)]
Fixed two typos in arch/powerpc/cpu/mpc83xx/start.S.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Wolfgang Denk [Fri, 21 May 2010 20:22:23 +0000 (22:22 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

14 years agoFix "par[t]ition" typo.
Wolfgang Denk [Tue, 17 Nov 2009 20:27:39 +0000 (21:27 +0100)]
Fix "par[t]ition" typo.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoUBI: Fix problem in UBI/Linux "compatibility layer"
Stefan Roese [Mon, 17 May 2010 08:01:05 +0000 (10:01 +0200)]
UBI: Fix problem in UBI/Linux "compatibility layer"

"down_write_trylock" needs to return 1 instead of 0 for success.
Otherwise copying a block with a read error (e.g. bit-flip on read)
won't work correctly.

Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoUBI: Ensure that "background thread" operations are really executed
Stefan Roese [Mon, 17 May 2010 08:00:51 +0000 (10:00 +0200)]
UBI: Ensure that "background thread" operations are really executed

The current U-Boot UBI implementation is copied from Linux. In this
porting the UBI background thread was not handled correctly. Upon write
operations ubi_wl_flush() makes sure, that all queued operations, like
page-erase, are completed. But this is missing for read operations.

This patch now makes sure that such operations (like scrubbing upon
bit-flip errors) are not queued, but executed directly.

Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoMX31: Added support for the Casio COM57H5M10XRC to QONG
Stefano Babic [Thu, 13 May 2010 08:26:40 +0000 (10:26 +0200)]
MX31: Added support for the Casio COM57H5M10XRC to QONG

The patch adds setup to connect a CASIO COM57H5M10XRC
(640x480 TFT display) to the QONG module.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agofsl_diu_fb.c: fix build warnings
Wolfgang Denk [Mon, 17 May 2010 21:34:18 +0000 (23:34 +0200)]
fsl_diu_fb.c: fix build warnings

Commit 15351855 "fsl-diu: Using I/O accessor to CCSR space" caused a
number of "passing argument 2 of 'out_be32' makes integer from pointer
without a cast" warnings; fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Dave Liu <daveliu@freescale.com>
Cc: Jerry Huang <Chang-Ming.Huang@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
14 years agoAvoid use of divides in print_size
Nick Thompson [Tue, 11 May 2010 10:29:52 +0000 (11:29 +0100)]
Avoid use of divides in print_size

Modification of print_size to avoid use of divides and especially
long long divides. Keep the binary scale factor in terms of bit
shifts instead. This should be faster, since the previous code
gave the compiler no clues that the divides where always powers
of two, preventing optimisation.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Acked-by: Timur Tabi <timur@freescale.com>
14 years agolan91c96, smc911x: remove useless free(ptr) calls on NULL ptr
Serge Ziryukin [Mon, 10 May 2010 14:40:49 +0000 (17:40 +0300)]
lan91c96, smc911x: remove useless free(ptr) calls on NULL ptr

Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Mon, 17 May 2010 21:16:08 +0000 (23:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Mon, 17 May 2010 21:14:41 +0000 (23:14 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Mon, 17 May 2010 21:11:21 +0000 (23:11 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years agoFix SICRL setting in SIMPC8313
Ron Madrid [Fri, 14 May 2010 23:27:48 +0000 (16:27 -0700)]
Fix SICRL setting in SIMPC8313

This patch sets the SICRL_LBC bits in SICRL to change the function of the
associated pins to GPIO functionality.

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
14 years agompc83xx: fix NAND bootstrap too big error
Kim Phillips [Fri, 14 May 2010 18:18:54 +0000 (13:18 -0500)]
mpc83xx: fix NAND bootstrap too big error

commit 167cdad1372917bc11c636c359aad02625291fa9 "SERIAL: Enable
port-mapped access" inadvertently broke 83xx nand boards by
converting NS16550_init to use io accessors, which expanded
the size of the generated code.

this patch fixes the problem by removing icache functions from
the nand builds, which somewhat follows commit
1a2e203b31d33fb720f2cf1033b241ad36ab405a "mpc83xx: turn on icache
in core initialization to improve u-boot boot time"

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoRemoval of checkboard from spl bootstrap build for SIMPC8313
Ron Madrid [Mon, 10 May 2010 22:23:20 +0000 (15:23 -0700)]
Removal of checkboard from spl bootstrap build for SIMPC8313

This patch removes the checkboard function from the build of
the 4k bootstrap section for the SIMPC8313 as it is not needed
in the spl build.  This will allow > 100 bytes of extra room
for other uses.

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoppc4xx: Fix building PLU405 board
Matthias Fuchs [Tue, 11 May 2010 07:54:00 +0000 (09:54 +0200)]
ppc4xx: Fix building PLU405 board

Due to some overlapping sections it's time to update TEXT_BASE
for this board.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoMakefile: fix out-of-tree building of "u-boot.img" target
Wolfgang Denk [Sat, 15 May 2010 19:23:51 +0000 (21:23 +0200)]
Makefile: fix out-of-tree building of "u-boot.img" target

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMVBLM7, MVSMR: fix Makefile (cleanup bootscript.img)
Wolfgang Denk [Sat, 15 May 2010 18:22:21 +0000 (20:22 +0200)]
MVBLM7, MVSMR: fix Makefile (cleanup bootscript.img)

Fix MVBLM7 and MVSMR Makefiles for correct out-of-tree building
(create "bootscript.img" in build directory instead of source
directory) and cleanup (remove "bootscript.img" when cleaning up).

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
14 years agoARM: add __aeabi_unwind_cpp_pr0() function to avoid linker complaints
Wolfgang Denk [Mon, 10 May 2010 21:08:02 +0000 (23:08 +0200)]
ARM: add __aeabi_unwind_cpp_pr0() function to avoid linker complaints

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Thomas Weber <weber@corscience.de>
14 years agodrivers/mmc/fsl_esdhc.c: fix compiler warnings
Wolfgang Denk [Sun, 9 May 2010 21:52:59 +0000 (23:52 +0200)]
drivers/mmc/fsl_esdhc.c: fix compiler warnings

Commit 77c1458d caused the following compiler warnings:

fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:142: warning: assignment discards qualifiers from pointer target type
fsl_esdhc.c: In function 'esdhc_setup_data':
fsl_esdhc.c:169: warning: unused variable 'wml_value'
fsl_esdhc.c: In function 'esdhc_pio_read_write':
fsl_esdhc.c:164: warning: control reaches end of non-void function

Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Dipen Dudhat <dipen.dudhat@freescale.com>
Cc: Andy Fleming <afleming@freescale.com>
14 years agoEnabled support for Rev 1.3 SPD for DDR2 DIMMs
York Sun [Fri, 7 May 2010 14:12:01 +0000 (09:12 -0500)]
Enabled support for Rev 1.3 SPD for DDR2 DIMMs

SPD has minor change from Rev 1.2 to 1.3. This patch enables Rev 1.3.
The difference has ben examined and the code is compatible.
Speed bins is not verified on hardware for CL7 at this moment.

This patch also enables SPD Rev 1.x where x is up to "F". According to SPD
spec, the lower nibble is optionally used to determine which additinal bytes
or attribute bits have been defined. Software can safely use defaults. However,
the upper nibble should always be checked.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx/fsl-sata: Use is_serdes_configured() to determine if SATA is enabled
Kumar Gala [Tue, 20 Apr 2010 15:21:25 +0000 (10:21 -0500)]
85xx/fsl-sata: Use is_serdes_configured() to determine if SATA is enabled

On the MPC85xx platform if we have SATA its connected on SERDES.
Determing if SATA is enabled via sata_initialize should not be board
specific and thus we move it out of the MPC8536DS board code.

Additionally, now that we have is_serdes_configured() we can determine
if the given SATA port is enabled and error out if its not in the
driver.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx/mpc8536ds: Use is_serdes_configured() to determine of PCIe enabled
Kumar Gala [Tue, 20 Apr 2010 15:21:12 +0000 (10:21 -0500)]
85xx/mpc8536ds: Use is_serdes_configured() to determine of PCIe enabled

The new is_serdes_configured covers a broader range of devices than the
PCI specific code.  Use it instead as we convert away from the
is_fsl_pci_cfg() code.

Additionally move to setting LAWs for PCI based on if its configured.
Also updated PCI FDT fixup code to remove PCI controllers from dtb if
they are configured.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Add is_serdes_configured() support to MPC8536 SERDES
Kumar Gala [Tue, 20 Apr 2010 15:20:33 +0000 (10:20 -0500)]
85xx: Add is_serdes_configured() support to MPC8536 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-diu: Using I/O accessor to CCSR space
Jerry Huang [Thu, 8 Apr 2010 07:56:07 +0000 (15:56 +0800)]
fsl-diu: Using I/O accessor to CCSR space

Using PPC I/O accessor to DIU I/O space instead of directly
read/write. It will prevent the dozen of compiler order issue
and PPC hardware order issue for accessing I/O space.

Using the toolchain(tc-fsl-x86lnx-e500-dp-4.3.74-2.i386.rpm)
can show up the order issue of DIU driver.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Sat, 8 May 2010 23:16:51 +0000 (01:16 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agompc83xx/mvBLM7: add usb commands and cleanup.
Andre Schwarz [Mon, 3 May 2010 11:22:31 +0000 (13:22 +0200)]
mpc83xx/mvBLM7: add usb commands and cleanup.

Add USB commands.
Rename autoscript to bootscript.
Add automatic bootscript image generation to makefile.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add UPMA configuration to SIMPC8313
Ron Madrid [Wed, 28 Apr 2010 23:04:43 +0000 (16:04 -0700)]
mpc83xx: Add UPMA configuration to SIMPC8313

Added UPM array table, upmconfig, and Local Bus configuration support for SIMPC8313

Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoserial: punt unused serial_addr()
Mike Frysinger [Wed, 5 May 2010 08:32:43 +0000 (04:32 -0400)]
serial: punt unused serial_addr()

Only one file apparently defines this function, and it merely stubs
it out. So if no one is defining/calling it, punt it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoupdate include/asm/ gitignore after move
Mike Frysinger [Tue, 27 Apr 2010 18:15:34 +0000 (14:15 -0400)]
update include/asm/ gitignore after move

With the cpu include paths moved, the gitignore paths need updating.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Tom Rix <tom@bumblecow.com>
14 years agoFixup native builds on powerpc
Kumar Gala [Wed, 28 Apr 2010 07:52:02 +0000 (02:52 -0500)]
Fixup native builds on powerpc

When we changed ARCH from ppc to powerpc we need to treat HOSTARCH the
same way.  We use HOSTARCH == ARCH to determine if a build is native.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agocmd_usb.c: show cmd usage if no args given
Serge Ziryukin [Sun, 25 Apr 2010 18:32:36 +0000 (21:32 +0300)]
cmd_usb.c: show cmd usage if no args given

Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
14 years agopowerpc: Consolidate bootcount_{store|load} for PowerPC
Stefan Roese [Wed, 28 Apr 2010 08:47:36 +0000 (10:47 +0200)]
powerpc: Consolidate bootcount_{store|load} for PowerPC

This patch consolidates bootcount_{store|load} for PowerPC by
implementing a common version in arch/powerpc/lib/bootcount.c. This
code is now used by all PowerPC variants that currently have these
functions implemented.

The functions now use the proper IO-accessor functions to read/write the
values.

This code also supports two different bootcount versions:

a) Use 2 separate words (2 * 32bit) to store the bootcounter
b) Use only 1 word (2 * 16bit) to store the bootcounter

Version b) was already used by MPC5xxx.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
          for 83xx parts
Cc: Michael Zaidman <michael.zaidman@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Anatolij Gustschin <agust@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Thu, 6 May 2010 21:21:00 +0000 (23:21 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

14 years agodrivers/*/Makefile: fix conditional compile rule.
Ender.Dai [Thu, 22 Apr 2010 07:24:25 +0000 (15:24 +0800)]
drivers/*/Makefile: fix conditional compile rule.

Fix conditional compile rule for twl4030.c and videomodes.c.

Signed-off-by: Ender.Dai <ender.dai@gmail.com>
14 years agoMove test for unnecessary memmove to memmove_wd()
Larry Johnson [Tue, 20 Apr 2010 12:09:43 +0000 (08:09 -0400)]
Move test for unnecessary memmove to memmove_wd()

Signed-off-by: Larry Johnson <lrj@acm.org>
14 years agocompiler.h: add uint typedef
Mike Frysinger [Tue, 20 Apr 2010 09:49:30 +0000 (05:49 -0400)]
compiler.h: add uint typedef

Recent crc changes started using the "uint" type in headers that are used
on the build system.  This subsequently broke mingw targets as they do not
provide such a type.  So add this basic typedef to compiler.h so that we
do not have to worry about this breaking again in the future.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agocommand.c: Enable auto tab for the editenv command
Trübenbach, Ralf [Wed, 14 Apr 2010 09:15:16 +0000 (11:15 +0200)]
command.c: Enable auto tab for the editenv command

Enable the auto completion (with TAB) of the environment variable name
after the editenv command.

Signed-off-by: Ralf Trübenbach <ralf.truebenbach@men.de>
14 years ago74xx_7xx: CPCI750: Add ECC support on esd CPCI-CPU/750 board
Reinhard Arlt [Tue, 13 Apr 2010 07:59:09 +0000 (09:59 +0200)]
74xx_7xx: CPCI750: Add ECC support on esd CPCI-CPU/750 board

Add ECC support for DDR RAM for MV64360 on esd CPCI-CPU/750 board.

This patch also adds the "pldver" command to display the CPLD
revision.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agosc520: Fix minor DRAM Controller Setup bug
Graeme Russ [Fri, 23 Apr 2010 14:06:00 +0000 (00:06 +1000)]
sc520: Fix minor DRAM Controller Setup bug

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Update to new AMD Copyright
Graeme Russ [Fri, 23 Apr 2010 14:05:59 +0000 (00:05 +1000)]
sc520: Update to new AMD Copyright

AMD recently changed the licensing of the RAM sizing code to the
GPLv2 (or at your option any later version)

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Implement eNET Watchdog
Graeme Russ [Fri, 23 Apr 2010 14:05:58 +0000 (00:05 +1000)]
eNET: Implement eNET Watchdog

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Use SC520 MMCR to reset eNET board
Graeme Russ [Fri, 23 Apr 2010 14:05:57 +0000 (00:05 +1000)]
eNET: Use SC520 MMCR to reset eNET board

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Add PC/AT compatibility setup function
Graeme Russ [Fri, 23 Apr 2010 14:05:56 +0000 (00:05 +1000)]
eNET: Add PC/AT compatibility setup function

The eNET uses the sc520 software timers rather than the PC/AT clones

Set all interrupts and timers up to be PC/AT compatible

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Add support for onboard RTL8100B (RTL8139) chips
Graeme Russ [Fri, 23 Apr 2010 14:05:55 +0000 (00:05 +1000)]
eNET: Add support for onboard RTL8100B (RTL8139) chips

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Board Specific PCI Init
Graeme Russ [Fri, 23 Apr 2010 14:05:54 +0000 (00:05 +1000)]
sc520: Board Specific PCI Init

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Move PCI defines to PCI include file
Graeme Russ [Fri, 23 Apr 2010 14:05:53 +0000 (00:05 +1000)]
sc520: Move PCI defines to PCI include file

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Fix CONFIG_SYS_HZ to be 1000
Graeme Russ [Fri, 23 Apr 2010 14:05:52 +0000 (00:05 +1000)]
eNET: Fix CONFIG_SYS_HZ to be 1000

The clock interupt has always been 1kHz as per timer_init() in
/arch/i386/cpu/sc520/sc520_timer.c

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agoeNET: Fix Flash Write
Graeme Russ [Fri, 23 Apr 2010 14:05:51 +0000 (00:05 +1000)]
eNET: Fix Flash Write

Onboard AMD Flash chip does not support buffered writes

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
14 years agosc520: Allow boards to override udelay
Graeme Russ [Fri, 23 Apr 2010 14:05:50 +0000 (00:05 +1000)]
sc520: Allow boards to override udelay

If the board has a high precision mico-second timer, it maked sense to use
it instead of the on-chip one

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>