oweals/u-boot.git
16 years agoFix printf errors.
Andrew Klossner [Mon, 7 Jul 2008 13:41:14 +0000 (06:41 -0700)]
Fix printf errors.

The compiler will help find mismatches between printf formats and
arguments if you let it.  This patch adds the necessary attributes to
declarations in include/common.h, then begins to correct the resulting
compiler warnings.  Some of these were bugs, e.g., "$d" instead of
"%d" and incorrect arguments.  Others were just annoying, like
int-long mismatches on a system where both are 32 bits.  It's worth
fixing the annoying errors to catch the real ones.

Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Wed, 9 Jul 2008 21:24:23 +0000 (23:24 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Wed, 9 Jul 2008 21:23:39 +0000 (23:23 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-net
Wolfgang Denk [Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-net

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-sh
Wolfgang Denk [Wed, 9 Jul 2008 21:09:36 +0000 (23:09 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-sh

16 years agoAllow print_size to print in GB
Becky Bruce [Wed, 9 Jul 2008 16:09:41 +0000 (11:09 -0500)]
Allow print_size to print in GB

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
16 years agomips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environment
Jason McMullan [Mon, 9 Jun 2008 03:56:00 +0000 (23:56 -0400)]
mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environment

Add 'ethaddr' and 'eth1addr' to the Linux kernel environment if
they are set in the U-Boot environment.

Signed-off-by: Jason McMullan <mcmullan@netapp.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agojedec_flash: Fix AM29DL800BB device ID
Stefan Roese [Tue, 8 Jul 2008 10:57:14 +0000 (12:57 +0200)]
jedec_flash: Fix AM29DL800BB device ID

As pointed out by Jerry Hicks, this patch corrects the device ID of
the Spansion AM29DL800BB NOR device. Verified against latest Spansion
datasheet (rev C4 from Dezember 2006).

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agosh: Fix compile error sh7763rdp board
Nobuhiro Iwamatsu [Mon, 7 Jul 2008 02:22:37 +0000 (11:22 +0900)]
sh: Fix compile error sh7763rdp board

Disable SH ether driver.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Fix SH-boards compile error
Nobuhiro Iwamatsu [Tue, 8 Jul 2008 03:03:24 +0000 (12:03 +0900)]
sh: Fix SH-boards compile error

By Cleanup out-or-tree building for some boards (.depend)
(commit:c8a3b109f07f02342d097b30908965f7261d9f15)
because filse ware changed, some SH-boards have compile error.
I revised this problem.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agoRemove duplicate code in cpu/arm926ejs/davinci/lxt972.c.
Hugo Villeneuve [Wed, 18 Jun 2008 16:10:33 +0000 (12:10 -0400)]
Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.

Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/lxt972.c.
Fixed style issues.

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoRemove duplicate definitions in include/lxt971a.h.
Hugo Villeneuve [Wed, 18 Jun 2008 16:10:31 +0000 (12:10 -0400)]
Remove duplicate definitions in include/lxt971a.h.

Remove duplicate definitions in include/lxt971a.h.

Remove duplicate registers and bits definitions in
include/lxt971a.h for standard MII registers, and
use values in include/miiphy.h instead.

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: sh: Renesas SH7763 Ethernet device support
Nobuhiro Iwamatsu [Wed, 11 Jun 2008 12:05:00 +0000 (21:05 +0900)]
net: sh: Renesas SH7763 Ethernet device support

Renesas SH7763 has 2 channel Ethernet device.
This is 10/100/1000 Base support.
But this patch check 10/100 Base only.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agosh: Update Renesas R2DPlus board
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:28:05 +0000 (16:28 +0900)]
sh: Update Renesas R2DPlus board

New NOR Flash board support and remove old type flash board config.
And Remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update Renesas R7780MP board
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:28:01 +0000 (16:28 +0900)]
sh: Update Renesas R7780MP board

New NOR Flash board support and remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update Renesas Migo-R board
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:56 +0000 (16:27 +0900)]
sh: Update Renesas Migo-R board

Remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Update Hitachi MS7722SE board
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:52 +0000 (16:27 +0900)]
sh: Update Hitachi MS7722SE board

Remove network setting from config file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Cleanup source code of SH7763RDP
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:48 +0000 (16:27 +0900)]
sh: Cleanup source code of SH7763RDP

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Cleanup source code of R2DPlus
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:44 +0000 (16:27 +0900)]
sh: Cleanup source code of R2DPlus

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Cleanup source code of R7780MP
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:41 +0000 (16:27 +0900)]
sh: Cleanup source code of R7780MP

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Cleanup source code of MS7722SE
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:38 +0000 (16:27 +0900)]
sh: Cleanup source code of MS7722SE

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Cleanup source code of MS7720SE
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 07:27:34 +0000 (16:27 +0900)]
sh: Cleanup source code of MS7720SE

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:48:02 +0000 (00:48 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-at91
Wolfgang Denk [Sun, 6 Jul 2008 22:47:58 +0000 (00:47 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-at91

16 years agoSH: fix out of tree building
Wolfgang Denk [Sun, 6 Jul 2008 22:45:03 +0000 (00:45 +0200)]
SH: fix out of tree building

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:39:50 +0000 (00:39 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-avr32
Wolfgang Denk [Sun, 6 Jul 2008 22:39:43 +0000 (00:39 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-avr32

16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sun, 6 Jul 2008 22:33:07 +0000 (00:33 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Sun, 6 Jul 2008 22:32:47 +0000 (00:32 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx

16 years agonet: smc911x: Fix typo
Nobuhiro Iwamatsu [Thu, 3 Jul 2008 14:16:06 +0000 (23:16 +0900)]
net: smc911x: Fix typo

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
16 years agoupdate mvBL-M7 board config
Andre Schwarz [Wed, 2 Jul 2008 16:54:08 +0000 (18:54 +0200)]
update mvBL-M7 board config

update mvBL-M7 config file to use UBOOT_VERSION and define
CONFIG_HIGH_BATS.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
16 years agonet: fix compile problem in smc911x driver.
Nobuhiro Iwamatsu [Mon, 30 Jun 2008 08:45:01 +0000 (17:45 +0900)]
net: fix compile problem in smc911x driver.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405
Michal Simek [Tue, 24 Jun 2008 07:54:09 +0000 (09:54 +0200)]
ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

This change helps with better handling with others
Xilinx based platform.

Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stefan Roese <sr@denx.de>
16 years agonet: ne2000: Move dev_addr variable from grobal to local.
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 04:07:11 +0000 (13:07 +0900)]
net: ne2000: Move dev_addr variable from grobal to local.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: ne2000: Fix compile error of NE2000
Nobuhiro Iwamatsu [Tue, 17 Jun 2008 04:07:15 +0000 (13:07 +0900)]
net: ne2000: Fix compile error of NE2000

If enable DEBUG, can not compile ne2000 driver.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoAdd mechanisms for CPU and board-specific Ethernet initialization
Ben Warren [Tue, 24 Jun 2008 05:57:27 +0000 (22:57 -0700)]
Add mechanisms for CPU and board-specific Ethernet initialization

This patch is the first step in cleaning up net/eth.c, by moving Ethernet
initialization to CPU or board-specific code.  Initial implementation is
only on the Freescale TSEC controller, but others will be added soon.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoinclude/sha256.h: fix file permissions.
Wolfgang Denk [Sat, 5 Jul 2008 23:21:46 +0000 (01:21 +0200)]
include/sha256.h: fix file permissions.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Wolfgang Denk [Sat, 5 Jul 2008 23:15:17 +0000 (01:15 +0200)]
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master

Conflicts:

board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years ago[AT91SAM9] Fix NAND FLASH timings
Patrice Vilchez [Tue, 27 May 2008 09:15:29 +0000 (11:15 +0200)]
[AT91SAM9] Fix NAND FLASH timings

Fix NAND FLASH timings for at91sam9x evaluation kits.

New timings are based on application note
"NAND Flash Support on AT91SAM9 Microcontrollers" available at
http://atmel.com/dyn/resources/prod_documents/doc6255.pdf

Signed-off-by: Patrice Vilchez <patice.vilchez@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Stelian Pop <stelian@popies.net>
16 years agoFix boot from NOR due to incorrect reset delay.
Stelian Pop [Wed, 21 May 2008 22:15:40 +0000 (00:15 +0200)]
Fix boot from NOR due to incorrect reset delay.

AT91 RSTC registers are battery-backuped, so their values
are not reset across power cycles. One of those registers,
the AT91_RSTC_MR register, is being modified by U-Boot, in
the ethernet initialisation routine, to generate a 500ms
user reset.

Unfortunately, this value is not being restored afterwards,
causing subsequent resets to also last for 500ms.

This long reset sequence causes problems (at least) in the
boot sequence from NOR: by the time the CPU tries to load
a program from the NOR flash, the latter is still in reset
and not yet available.

Additionaly, this patch fixes a bug in the original code which
caused the reset delay to last for 2s instead of 500ms.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoUpdate CHANGELOG
Wolfgang Denk [Fri, 4 Jul 2008 18:11:49 +0000 (20:11 +0200)]
Update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCCM/SCM boards: fix out of tree building
Wolfgang Denk [Fri, 4 Jul 2008 18:07:35 +0000 (20:07 +0200)]
CCM/SCM boards: fix out of tree building

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoSCM board: fix build errors.
Wolfgang Denk [Thu, 3 Jul 2008 21:22:27 +0000 (23:22 +0200)]
SCM board: fix build errors.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoIAD210 board: fix ``"ALIGN" redefined'' warning.
Wolfgang Denk [Thu, 3 Jul 2008 21:06:36 +0000 (23:06 +0200)]
IAD210 board: fix ``"ALIGN" redefined'' warning.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCCM board: fix build errors.
Wolfgang Denk [Thu, 3 Jul 2008 21:00:24 +0000 (23:00 +0200)]
CCM board: fix build errors.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoupdate mvBL-M7 board config
Andre Schwarz [Wed, 2 Jul 2008 16:54:08 +0000 (18:54 +0200)]
update mvBL-M7 board config

update mvBL-M7 config file to use UBOOT_VERSION.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agosacsng board: fix warnings "suggest explicit braces to avoid ambiguous 'else'"
Wolfgang Denk [Thu, 3 Jul 2008 20:39:21 +0000 (22:39 +0200)]
sacsng board: fix warnings "suggest explicit braces to avoid ambiguous 'else'"

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: fix "expected specifier-qualifier-list before 'phys_size_t'" errors
Wolfgang Denk [Thu, 3 Jul 2008 20:34:08 +0000 (22:34 +0200)]
Cleanup: fix "expected specifier-qualifier-list before 'phys_size_t'" errors

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolmb: fix "implicit declaration of function 'lmb_free'" warning
Wolfgang Denk [Thu, 3 Jul 2008 20:04:17 +0000 (22:04 +0200)]
lmb: fix "implicit declaration of function 'lmb_free'" warning

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: remove redundant deleting on *~ files
Wolfgang Denk [Wed, 2 Jul 2008 21:53:23 +0000 (23:53 +0200)]
Cleanup: remove redundant deleting on *~ files

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup out-or-tree building for some boards (.depend)
Wolfgang Denk [Wed, 2 Jul 2008 21:49:18 +0000 (23:49 +0200)]
Cleanup out-or-tree building for some boards (.depend)

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: fix out-of-tree building for some boards
Wolfgang Denk [Wed, 2 Jul 2008 21:38:50 +0000 (23:38 +0200)]
Cleanup: fix out-of-tree building for some boards

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)
Wolfgang Denk [Wed, 2 Jul 2008 21:00:14 +0000 (23:00 +0200)]
Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agofdt: Fix typo in variable name.
Detlev Zundel [Fri, 20 Jun 2008 20:26:24 +0000 (22:26 +0200)]
fdt: Fix typo in variable name.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoAdd logos for RRvision board
Gary Jennejohn [Thu, 19 Jun 2008 09:11:19 +0000 (11:11 +0200)]
Add logos for RRvision board

Signed-off-by: Gary Jennejohn <garyj@denx.de>
16 years agompc8260: add fdt_fixup_ethernet support
Esben Haabendal [Wed, 18 Jun 2008 09:03:57 +0000 (11:03 +0200)]
mpc8260: add fdt_fixup_ethernet support

Add support for updating mac-address and local-mac-address in fdt for
all MPC8260 targets.

Signed-off-by: Esben Haabendal <eha@doredevelopment.dk>
16 years agocmd_nvedit.c: clean up syntax highlighting
Steven A. Falco [Thu, 12 Jun 2008 17:24:42 +0000 (13:24 -0400)]
cmd_nvedit.c: clean up syntax highlighting

My text-editor (vim) has a bit of trouble syntax-highlighting the
cmd_nvedit.c file, because it apparently does not parse C
ifdef/else/endif. The following patch does not change the behavior of
the code at all, but does allow the editor to properly
syntax-highlight the file.

Signed-off-by: Steve Falco <sfalco@harris.com>
16 years agoMake setenv() return status
Steven A. Falco [Thu, 12 Jun 2008 17:22:12 +0000 (13:22 -0400)]
Make setenv() return status

Currently, the setenv function does not return an error code.
This patch allows to test for errors.

Signed-off-by: Steve Falco <sfalco@harris.com>
16 years agoPPC: Added fls, fls64, __ilog2_u64, and ffs64 to bitops
Kumar Gala [Wed, 11 Jun 2008 15:14:06 +0000 (10:14 -0500)]
PPC: Added fls, fls64, __ilog2_u64, and ffs64 to bitops

fls64, __ilog2_u64, ffs64 are variants that work on an u64,
and fls is used to implement them.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoi.MX31: Cleanup comments in lowlevel_init.S.
Magnus Lilja [Mon, 9 Jun 2008 20:58:48 +0000 (22:58 +0200)]
i.MX31: Cleanup comments in lowlevel_init.S.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoMove conditional compilation of MPC8XXX SPI driver to Makefile
Ben Warren [Mon, 9 Jun 2008 06:28:33 +0000 (23:28 -0700)]
Move conditional compilation of MPC8XXX SPI driver to Makefile

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agoi.MX31: fixed CTRL-C detection
Juergen Kilb [Sun, 8 Jun 2008 15:59:53 +0000 (17:59 +0200)]
i.MX31: fixed CTRL-C detection

The Register URXD contains status information in bits [15..8].
With status bit 15 set, CTRL-C was reported as 0x8003 instead
of 0x03. Therefore CTRL-C was not detected.
To solve this, bits [15..8] were masked out now.

Signed-off-by: Juergen Kilb <J.Kilb@gmx.de>
Acked-by: Felix Radensky <felix@embedded-sol.com>
16 years agoadd SHA256 support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 7 Jun 2008 10:29:52 +0000 (12:29 +0200)]
add SHA256 support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Francesco Albanese <Francesco.Albanese@swisscom.com>
16 years agoDelay FIT format check on sector based devices
Marian Balakowicz [Fri, 6 Jun 2008 21:07:40 +0000 (23:07 +0200)]
Delay FIT format check on sector based devices

Global FIT image operations like format check cannot be performed on
a first sector data, defer them to the point when whole FIT image was
uploaded to a system RAM.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Partial ('cmd_nand' case) Acked-by: Grant Erickson <gerickson@nuovations.com>
NAND and DOC bits Acked-by: Scott Wood <scottwood@freescale.com>

16 years agosata: wait for device updating signature to host
Dave Liu [Tue, 3 Jun 2008 09:38:19 +0000 (17:38 +0800)]
sata: wait for device updating signature to host

The driver need wait for the device updating signature to host.
If we don't wait for it, the driver can not detect the device(disk)
when the system powers up.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Detlev Zundel [Mon, 30 Jun 2008 13:35:34 +0000 (15:35 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoppc4xx: Fix 460EX errata with CPU lockup upon high AHB traffic
Stefan Roese [Sat, 28 Jun 2008 12:56:17 +0000 (14:56 +0200)]
ppc4xx: Fix 460EX errata with CPU lockup upon high AHB traffic

This patch implements a fix provided by AMCC so that the lockup upon
simultanious traffic on AHB USB OTG, USB 2.0 and SATA doesn't occur
anymore:

Set SDR0_AHB_CFG[A2P_INCR4] (bit 24) and clear SDR0_AHB_CFG[A2P_PROT2]
(bit 25) for a new 460EX errata regarding concurrent use of AHB USB OTG,
USB 2.0 host and SATA.

This errata is not officially available yet. I'll update the comment
to add the errata number later.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoserial_pl010.c: add watchdog support
Stuart Wood [Mon, 2 Jun 2008 20:42:19 +0000 (16:42 -0400)]
serial_pl010.c: add watchdog support

Signed-off-by: Stuart Wood <stuart.wood@labxtechnologies.com>
16 years agojffs2_1pass.c: add watchdog support
Stuart Wood [Mon, 2 Jun 2008 20:40:08 +0000 (16:40 -0400)]
jffs2_1pass.c: add watchdog support

Signed-off-by: Stuart Wood <stuart.wood@labxtechnologies.com>
16 years agoConfigure DSP POST; add watchdog reset to diag command
Sascha Laue [Fri, 30 May 2008 07:48:14 +0000 (09:48 +0200)]
Configure DSP POST; add watchdog reset to diag command

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
16 years agoAdd sata sil3114 support
Tor Krill [Thu, 29 May 2008 08:40:17 +0000 (10:40 +0200)]
Add sata sil3114 support

Signed-off-by: Tor Krill <tor@excito.com>
16 years agoCoding Style Cleanup
Wolfgang Denk [Sat, 28 Jun 2008 21:34:37 +0000 (23:34 +0200)]
Coding Style Cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate CHANGELOG
Wolfgang Denk [Sat, 28 Jun 2008 21:16:01 +0000 (23:16 +0200)]
Update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoARM: Add support for Lyrtech SFF-SDR board (ARM926EJS)
Hugo Villeneuve [Wed, 21 May 2008 17:58:41 +0000 (13:58 -0400)]
ARM: Add support for Lyrtech SFF-SDR board (ARM926EJS)

This patch adds support for the Lyrtech SFF-SDR board,
based on the TI DaVinci architecture (ARM926EJS).

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMMC: Consolidate MMC/SD command definitions
Haavard Skinnemoen [Thu, 22 May 2008 09:09:59 +0000 (11:09 +0200)]
MMC: Consolidate MMC/SD command definitions

This moves the MMC and SD Card command definitions from
include/asm/arch/mmc.h into include/mmc.h. These definitions are
given by the MMC and SD Card standards, not by any particular
architecture.

There's a lot more room for consolidation in the MMC drivers which
I'm hoping to get done eventually, but this patch is a start.

Compile-tested for all avr32 boards as well as lpc2292sodimm and
lubbock. This should cover all three mmc drivers in the tree.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoUse better Ethernet timings for apollon board
Kyungmin Park [Wed, 21 May 2008 05:38:08 +0000 (14:38 +0900)]
Use better Ethernet timings for apollon board

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
16 years agoResize device tree to allow space for board changes and the chosen node
Andy Fleming [Mon, 16 Jun 2008 18:58:56 +0000 (13:58 -0500)]
Resize device tree to allow space for board changes and the chosen node

Current code requires that a compiled device tree have space added to the end to
leave room for extra nodes added by board code (and the chosen node).  This
requires that device tree creators anticipate how much space U-Boot will add to
the tree, which is absurd.  Ideally, the code would resize and/or relocate the
tree when it needed more space, but this would require a systemic change to the
fdt code, which is non-trivial.  Instead, we resize the tree inside
boot_relocate_fdt, reserving either the remainder of the bootmap (in the case
where the fdt is inside the bootmap), or adding CFG_FDT_PAD bytes to the size.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoFix an underflow bug in __lmb_alloc_base
Andy Fleming [Mon, 16 Jun 2008 18:58:55 +0000 (13:58 -0500)]
Fix an underflow bug in __lmb_alloc_base

__lmb_alloc_base can underflow if it fails to find free space.  This was fixed
in linux with commit d9024df02ffe74d723d97d552f86de3b34beb8cc.  This patch
merely updates __lmb_alloc_base to resemble the current version in Linux.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoAdd lmb_free
Andy Fleming [Mon, 16 Jun 2008 18:58:54 +0000 (13:58 -0500)]
Add lmb_free

lmb_free allows us to unreserve some memory so we can use lmb_alloc_base or
lmb_reserve to temporarily reserve some memory.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoAdd ALIGN() macro
Andy Fleming [Mon, 16 Jun 2008 18:58:53 +0000 (13:58 -0500)]
Add ALIGN() macro

ALIGN() returns the smallest aligned value greater than the passed
in address or size.  Taken from Linux.

Signed-off-by: Andy Fleming <afleming@freescale.com>
16 years agoppc4xx: Fix compilation problems with phys_size_t
Stefan Roese [Tue, 24 Jun 2008 15:15:22 +0000 (17:15 +0200)]
ppc4xx: Fix compilation problems with phys_size_t

This patch includes <asm/types.h> before <asm/u-boot.h> in some 4xx
board specific files where it has been missing.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoConditionally add -fno-stack-protector to CFLAGS
Haavard Skinnemoen [Mon, 19 May 2008 10:26:38 +0000 (12:26 +0200)]
Conditionally add -fno-stack-protector to CFLAGS

When compile-testing on powerpc, I get errors like this:

net/nfs.c:422: undefined reference to `__stack_chk_fail_local'

This seems to be because -fstack-protector is on by default, so
let's explicitly disable it on all architectures that support the
option.

The Ubuntu toolchain is affected by this problem, and according to
Mike Frysinger, Gentoo has been running with SSP enabled for years.
More and more distros are turning SSP on by default, so this problem
is likely to get worse in the future.

Also, powerpc just happens to be one of the arches I do
compile-testing on. There may be other arches affected by this too.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
16 years agopcmcia/ti_pci1410a: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:52 +0000 (19:09 +0200)]
pcmcia/ti_pci1410a: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agopxa_pcmcia: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:51 +0000 (19:09 +0200)]
pxa_pcmcia: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agomarabun_pcmcia: Move compile condition to the Makefile
Jean-Christophe PLAGNIOL-VILLARD [Sun, 18 May 2008 17:09:50 +0000 (19:09 +0200)]
marabun_pcmcia: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agofix non-working mvBL-M7
Andre Schwarz [Mon, 23 Jun 2008 11:25:34 +0000 (13:25 +0200)]
fix non-working mvBL-M7

Add missing #define CONFIG_HIGH_BATS in mvBL-M7 board config file.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agofix system config overwrite @ MPC834x and MPC8313
Andre Schwarz [Mon, 23 Jun 2008 09:40:56 +0000 (11:40 +0200)]
fix system config overwrite @ MPC834x and MPC8313

During 83xx setup the "System I/O configuration register high" gets
overwritten with user defined value if CFG_SICRH is defined.

Regarding to the MPC834x manual (Table 5-28 reve.1) bits 28+29 of SICRH
must keep their reset value regardless of configuration.

On my board (using RGMII) those bits are set after reset - yet it's
unclear where they come from.

The patch keeps both bits on MPC834x and MPC8313.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: move CPU_TYPE_ENTRY over to processor.h
Kim Phillips [Tue, 17 Jun 2008 22:45:27 +0000 (17:45 -0500)]
mpc83xx: move CPU_TYPE_ENTRY over to processor.h

to avoid this:

cpu.c:47:1: warning: "CPU_TYPE_ENTRY" redefined
In file included from cpu.c:33:
/home/kim/git/u-boot/include/asm/processor.h:982:1: warning: this is the location of the previous definition

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoppc4xx: Fix problem in gpio_config()
Stefan Roese [Mon, 23 Jun 2008 09:15:09 +0000 (11:15 +0200)]
ppc4xx: Fix problem in gpio_config()

As pointed out by Guennadi Liakhovetski (thanks), pin2 is already shifted
left by one. So the additional shift is bogus.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agofdt: Fix typo in variable name.
Detlev Zundel [Fri, 20 Jun 2008 20:24:05 +0000 (22:24 +0200)]
fdt: Fix typo in variable name.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoavr32: Enable SPI flash support on ATNGW100
Haavard Skinnemoen [Fri, 20 Jun 2008 08:41:05 +0000 (10:41 +0200)]
avr32: Enable SPI flash support on ATNGW100

The ATNGW100 has 8MB DataFlash on board. Give users access to it through
the new SPI flash framework.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoavr32: Fix SPI portmux initialization
Haavard Skinnemoen [Fri, 20 Jun 2008 10:44:28 +0000 (12:44 +0200)]
avr32: Fix SPI portmux initialization

Use the new GPIO manipulation functions to set up the chip select lines,
and make sure both busses use GPIO for chip select control.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoavr32: Add GPIO manipulation functions
Peter Ma [Mon, 2 Jun 2008 05:59:24 +0000 (22:59 -0700)]
avr32: Add GPIO manipulation functions

Adds GPIO manipulation functions for AVR32 AP7 platform.

Signed-off-by: Peter Ma <pma@mediamatech.com>
[haavard.skinnemoen@atmel.com: coding style fixup, slight simplification]
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Thu, 19 Jun 2008 20:57:58 +0000 (22:57 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
Wolfgang Denk [Thu, 19 Jun 2008 20:57:06 +0000 (22:57 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash

16 years agoMPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver
Wolfgang Grandegger [Thu, 5 Jun 2008 11:02:30 +0000 (13:02 +0200)]
MPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver

This patch is based on the following patch sent a few minutes ago:
"NAND FSL UPM: driver re-write using the hwcontrol callback"
It is untested, of course. Anton, could you please give it a try.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
16 years agoFix 4xx build issue
Anatolij Gustschin [Thu, 12 Jun 2008 10:40:11 +0000 (12:40 +0200)]
Fix 4xx build issue

Building for 4xx doesn't work since commit 4dbdb768:

In file included from 4xx_pcie.c:28:
include/asm/processor.h:971: error: expected ')' before 'ver'
make[1]: *** [4xx_pcie.o] Error 1

This patch fixes the problem.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
16 years agocfi-flash: Fix problem in flash_toggle(), busy was not detected reliably
Stefan Roese [Mon, 16 Jun 2008 08:40:02 +0000 (10:40 +0200)]
cfi-flash: Fix problem in flash_toggle(), busy was not detected reliably

This patch simplifies flash_toggle() (AMD commandset), which is used to
detect if a FLASH device is still busy with erase/program operations. On
800MHz Canyonlands/Glacier boards (460EX/GT) the current implementation
did not detect the busy state reliably, resulting in non erased sectors
etc. This patch now simplifies this function by "just" comparing the
complete data-word instead of ANDing it with the command-word (0x40)
before the compatison. It is done the same way in the Linux implementation
chip_ready() in cfi_cmdset_0002.c.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoNAND: Add missing declaration to non-redundant saveenv().
Philip Balister [Mon, 16 Jun 2008 12:58:07 +0000 (08:58 -0400)]
NAND: Add missing declaration to non-redundant saveenv().

Signed-off-by: Scott Wood <scottwood@freescale.com>