Commit graph

3257 commits

Author SHA1 Message Date
Wilson Callan
5d110f0aa6 New CONFIG_BOOTP_SERVERIP option
Added CONFIG_BOOTP_SERVERIP to allow the tftp server to be different
from the bootp server

Signed-off-by: Wilson Callan <wcallan@savantav.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-08-13 23:07:53 -04:00
Mike Rapoport
50cca8b976 Add ability to take MAC address from the environment to DM9000 driver
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-08-13 23:06:34 -04:00
Ben Warren
d1bc6c8d5f Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/bcm570x.c
	drivers/tigon3.c
2007-08-13 21:26:03 -04:00
Wolfgang Denk
8a92b7c60b Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx 2007-08-13 22:00:25 +02:00
Wolfgang Denk
be5d72d10d Minor coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-13 21:57:53 +02:00
Jon Loeliger
8e2dd87eee Merge commit 'remotes/wd/master'
Conflicts:

	MAKEALL

With any luck, this is the last MAKEALL merge conflict!
2007-08-13 11:01:52 -05:00
Joe Hamman
cca34967cb Modify SBC8641D to use new Freescale PCI routines
PCI-Express sockets 1 and 2 verified working with Intel Pro/1000 PT
adapter.

Signed-off-by: Joe Hamman <joe.hamman@embeddedspecialties.com>
Signde-off-by: Jon Loeliger <jdl@freescale.com>
2007-08-13 10:54:44 -05:00
Haavard Skinnemoen
a08458303e atmel_mci: Fix data timeout value
Calculate the data timeout based on values from the CSD instead of
just using a hardcoded DTOR value. This is a backport of a similar fix
in BSP 2.0, with one additional fix: the DTOCYC value is rounded up
instead of down.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2007-08-13 17:35:16 +02:00
Haavard Skinnemoen
0ba8eed28b AVR32: Include <div64.h> instead of <asm/div64.h>
include/asm-avr32/div64.h was recently moved to include/div64.h, but
cpu/at32ap/interrupts.c wasn't properly updated (an earlier version of
the patch was merged perhaps?)

This patch updates cpu/at32ap/interrupts.c so that the avr32 port
compiles again.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2007-08-13 17:22:31 +02:00
Haavard Skinnemoen
375c2c9e57 Merge commit 'upstream/master' 2007-08-13 16:34:33 +02:00
Haavard Skinnemoen
f0d1246ed7 atmel_mci: Use 512 byte blocksize if possible
Instead of always using the largest blocksize the card supports, check
if it can support smaller block sizes and use 512 bytes if possible.
Most cards do support this, and other parts of u-boot seem to have
trouble with block sizes different from 512 bytes.

Also enable underrun/overrun protection.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
2007-08-13 16:33:52 +02:00
Stefan Roese
273db7e1bd ppc4xx: Fix problem in PLL clock calculation
This patch was originall provided by David Mitchell <dmitchell@amcc.com>
and fixes a bug in the PLL clock calculation.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-13 09:05:33 +02:00
Wolfgang Denk
9986bc3e40 Update CHANGELOG 2007-08-12 21:34:50 +02:00
Wolfgang Denk
77d19a8bf3 Minor alignment of output, 2nd try.
Also update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 21:34:34 +02:00
Wolfgang Denk
6b309f22a7 Minor alignment of output
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 20:35:49 +02:00
Wolfgang Denk
6f6d7b9c85 Cleanup output on ADS5121 board
Signed-off-by: Wolfgang Denk
2007-08-12 18:28:18 +02:00
Wolfgang Denk
0cfc9d6ad1 Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master 2007-08-12 18:12:38 +02:00
Wolfgang Denk
a4d2636f2a Adapt board configuration and fix kernel crash on MCC200 board.
The update procedure was modified to turn off the USB subsystem
before exit for MCC200 and TRAB. This is necessary as otherwise the
USB controller continues to write periodically to system memory!

MCC200-specific notes:
- the patch disables the magic key check for MCC200
- the patch contains the configuration changes made
  for the new revision of the board.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 15:11:38 +02:00
Wolfgang Denk
e27f3a6efb Adjust default configuration of ADS5121 board.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 14:47:54 +02:00
Wolfgang Denk
afaac86fe2 Clean up some remaining CFG_CMD_ -> CONFIG_CMD_ issues.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 14:27:39 +02:00
Wolfgang Denk
308e2b3a6c Merge with /home/wd/git/u-boot/custodian/u-boot-fdt 2007-08-11 02:14:05 +02:00
Gerald Van Baren
5fe6be6208 Improve error print messages.
Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:37 -04:00
Kim Phillips
99dffca3b7 fdt: allow for builds that don't want env and bd_t nodes
protect fdt_env and fdt_bd_t invocations, fix codingstyle while in the
area.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 19:21:37 -04:00
Kim Phillips
91148bf7ae fdt: do board setup based on fdt address specified on bootm line
The last fdt patch to bootm did board setup based on the address
specified by a prior fdt address command invocation.  The bootm
code, as its call to fdt_chosen does, should use the fdt specified
by the user on the bootm command.  Note this restores full
functionality for the 8360's existing default boot environment
values, e.g. 'run nfsboot' (i.e. no having to 'fdt addr $fdtaddr'
before booting a kernel).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
e125a2ffc2 Call ft_board_setup() from the bootm command.
In the patch titled "Create new fdt boardsetup command..." I removed the
call to ft_board_setup() from the routine fdt_chosen(), but I forgot
to add a direct call back into cmd_bootm.c

This fixes the oversight by adding the direct call to the bootm command.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
fd61e55dd8 Create new fdt boardsetup command, fix bug parsing [] form of set values.
Previously ft_board_setup() was called by fdt_chosen() which was not
really correctly structured.  This splits ft_board_setup() out by creating
a new fdt boardsetup command.

Fix a bug when parsing fdt set command values which have the square
bracket form [00 11 22 33] - the length was updated incorrectly in when
parsing that form.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
6f35ded9e8 Tighten up the error messages.
Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
c45874b05a Asthetic improvements: error messages and line lengths.
Tighten up the error messages, split overlength lines.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
35ec398f16 Fix fdt_chosen() to call ft_board_setup(), clean up long lines.
The fdt_chosen() function was adding/seting some properties ad-hoc
  improperly and duplicated (poorly) what was done in ft_board_setup()

Clean up long lines (setting properties, printing errors).

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
06e19a0770 For fdt_find_node_by_path(), handle the root path properly.
Also removes the special case root path detection in cmd_fdt.c since it
is no longer necessary.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
9675ee7208 Add fdt_find_node_by_type() and fdt_find_compatible_node() to LIBFDT
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
1a861169bc Replace fdt_node_offset() with fdt_find_node_by_path().
The new name matches more closely the kernel's name, which is also
a much better description.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
addd8ce830 Fix cmd_fdt line lengths, refactor code.
Break lines that were greater than 80 characters in length.
Move the fdt print and property parsing code to separate static functions
  to reduce coding clutter in the fdt_cmd handling body.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
25114033ab FDT command improvements.
Fix "fdt set" so that it will create a non-existing property.
Add "fdt mknode" to create nodes.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
38eb508e8e Reorganize and fix problems (returns) in the bootm command.
Do *NOT* return after the "point of no return" has been passed.
  If something goes wrong, the board must be reset after that point.
Move the "Transferring control to Linux" debug message back to where it
  belongs: just before transferring control to linux.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:36 -04:00
Gerald Van Baren
89c8757d8f Fix bugs in the CONFIG_OF_LIBFDT
Stupid coding mistakes (identified by Timur Tabi, thanks).

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:35 -04:00
Gerald Van Baren
6be07cc1ca Improve fdt move length handling.
Make the length parameter optional: if not specified, do the move using
the current size unchanged.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:35 -04:00
Gerald Van Baren
bb930e76fe Minor code clean up.
Declare the variable fdt properly as extern.
Call the "set_fn" function pointer the "short way" without the full
  dereferencing syntax.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:35 -04:00
Gerald Van Baren
ba24e2ac3b Improve error messages, more informative.
Print more than the raw libfdt error message strings.  This is especially
useful for cluing in the user when the bootm command aborts due to
blob problems.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:35 -04:00
Gerald Van Baren
8096b3b8f7 libfdt: Conditionally compile based on CONFIG_OF_LIBFDT
This is the way u-boot reduces configured-out code.  At Wolfgang
Grandegger and Wolfgang Denk's request, make libfdt conform.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
2007-08-10 19:21:35 -04:00
Gerald Van Baren
29eaae9534 Merge git://www.denx.de/git/u-boot 2007-08-10 19:19:50 -04:00
Bruce Adler
923efd2864 add image size and descriptors for Spartan 3E FPGA chips
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)

Signed-off by: Bruce Adler <bruce.adler@ccpu.com>
2007-08-11 00:34:03 +02:00
Kim Phillips
fb56579ffe make MAKEALL more immune to merge conflicts
..by placing board entries one per line, as suggested by jdl.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 23:34:42 +02:00
Kim Phillips
2628114ec5 README: Remove outdated cpu type, board type, and NAME_config lists
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 22:10:29 +02:00
Dave Liu
49bb59912d mpc83xx: Suppress the warning 'burstlen'
suppress the warning 'burstlen' of spd_sdram.

Signed-off-by: Dave Liu <daveliu@freescale.com>
2007-08-10 22:00:52 +02:00
Joe Hamman
c646bba646 Add support for SBC8641D. Config files.
Add support for Wind River's SBC8641D reference board.

Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Jon Loeliger <jdl@freescale.com>
2007-08-10 14:50:05 -05:00
Joe Hamman
8ac273271d Add support for SBC8641D. Board files.
Add support for Wind River's SBC8641D reference board.

Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Jon Loeliger <jdl@freescale.com>
2007-08-10 14:30:30 -05:00
Stefan Roese
f2c459ce6e Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefan 2007-08-10 20:38:35 +02:00
Stefan Roese
c2c0ab4aff Conding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-10 20:34:58 +02:00
Stefan Roese
59530af556 Merge with git://www.denx.de/git/u-boot.git 2007-08-10 20:33:06 +02:00