Stefan Roese
7c6237b3e2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
2008-07-07 09:51:25 +02:00
Hugo Villeneuve
63676841ca
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 >
2008-07-06 23:44:34 -07:00
Hugo Villeneuve
fec61431a0
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 >
2008-07-06 23:44:34 -07:00
Nobuhiro Iwamatsu
9751ee0990
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 >
2008-07-06 23:32:04 -07:00
Nobuhiro Iwamatsu
873d97aabc
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 >
2008-07-07 11:21:40 +09:00
Nobuhiro Iwamatsu
ec39d479d2
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 >
2008-07-07 11:21:40 +09:00
Nobuhiro Iwamatsu
c001cd604e
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 >
2008-07-07 11:21:40 +09:00
Nobuhiro Iwamatsu
f9599eca7c
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 >
2008-07-07 11:21:40 +09:00
Nobuhiro Iwamatsu
26209e48e8
sh: Cleanup source code of SH7763RDP
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
2008-07-07 11:21:38 +09:00
Nobuhiro Iwamatsu
5cd5b2c96e
sh: Cleanup source code of R2DPlus
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
2008-07-07 11:21:38 +09:00
Nobuhiro Iwamatsu
4ec7e915cf
sh: Cleanup source code of R7780MP
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
2008-07-07 11:21:38 +09:00
Nobuhiro Iwamatsu
0955ef34c0
sh: Cleanup source code of MS7722SE
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
2008-07-07 11:21:38 +09:00
Nobuhiro Iwamatsu
1d7b31d97b
sh: Cleanup source code of MS7720SE
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
2008-07-07 11:21:37 +09:00
Wolfgang Denk
c956717ab2
Merge branch 'master' of /home/wd/git/u-boot/custodians
2008-07-07 00:48:02 +02:00
Wolfgang Denk
4e0018f1cf
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
2008-07-07 00:47:58 +02:00
Wolfgang Denk
3ab4827cbe
SH: fix out of tree building
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-07 00:45:03 +02:00
Wolfgang Denk
01981269c1
Merge branch 'master' of /home/wd/git/u-boot/custodians
2008-07-07 00:39:50 +02:00
Wolfgang Denk
b223017f08
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
2008-07-07 00:39:43 +02:00
Wolfgang Denk
b0f1c03607
Merge branch 'master' of /home/wd/git/u-boot/custodians
2008-07-07 00:33:07 +02:00
Wolfgang Denk
3070a9a3cb
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
2008-07-07 00:32:47 +02:00
Nobuhiro Iwamatsu
9047bfa1e7
net: smc911x: Fix typo
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com >
2008-07-07 00:31:27 +02:00
Andre Schwarz
5ed546fdd0
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 >
2008-07-07 00:30:20 +02:00
Nobuhiro Iwamatsu
5cacc5d0ec
net: fix compile problem in smc911x driver.
...
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org >
Acked-by: Ben Warren <biggerbadderben@gmail.com >
2008-07-07 00:20:21 +02:00
Michal Simek
9fea65a6c4
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 >
2008-07-06 22:39:14 +02:00
Nobuhiro Iwamatsu
cbb6289569
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 >
2008-07-06 00:23:44 -07:00
Nobuhiro Iwamatsu
dd7e5fa5f8
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 >
2008-07-06 00:23:44 -07:00
Ben Warren
dd35479a50
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 >
2008-07-06 00:20:59 -07:00
Wolfgang Denk
7754f2be5d
include/sha256.h: fix file permissions.
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-06 01:21:46 +02:00
Wolfgang Denk
d86a0a6f7f
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 >
2008-07-06 01:15:17 +02:00
Patrice Vilchez
d3bcdf838e
[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 >
2008-07-05 17:32:22 +02:00
Stelian Pop
19bd688484
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 >
2008-07-05 17:32:22 +02:00
Wolfgang Denk
f492dd636f
Update CHANGELOG
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-04 20:11:49 +02:00
Wolfgang Denk
5e6e350fc4
CCM/SCM boards: fix out of tree building
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-04 20:07:35 +02:00
Wolfgang Denk
ab4c3a490d
SCM board: fix build errors.
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 23:22:27 +02:00
Wolfgang Denk
a566466f17
IAD210 board: fix ``"ALIGN" redefined'' warning.
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 23:06:36 +02:00
Wolfgang Denk
ad75631479
CCM board: fix build errors.
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 23:00:24 +02:00
Andre Schwarz
f16ed51702
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 >
2008-07-03 15:43:21 -05:00
Wolfgang Denk
ced209c50e
sacsng board: fix warnings "suggest explicit braces to avoid ambiguous 'else'"
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 22:39:21 +02:00
Wolfgang Denk
4ff170a818
Cleanup: fix "expected specifier-qualifier-list before 'phys_size_t'" errors
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 22:34:08 +02:00
Wolfgang Denk
730f298485
lmb: fix "implicit declaration of function 'lmb_free'" warning
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-03 22:04:17 +02:00
Wolfgang Denk
322ef5e28d
Cleanup: remove redundant deleting on *~ files
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-02 23:53:23 +02:00
Wolfgang Denk
c8a3b109f0
Cleanup out-or-tree building for some boards (.depend)
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-02 23:49:18 +02:00
Wolfgang Denk
a30cc5a340
Cleanup: fix out-of-tree building for some boards
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-02 23:38:50 +02:00
Wolfgang Denk
461fa68d20
Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)
...
Signed-off-by: Wolfgang Denk <wd@denx.de >
2008-07-02 23:00:14 +02:00
Detlev Zundel
5981ebd320
fdt: Fix typo in variable name.
...
Signed-off-by: Detlev Zundel <dzu@denx.de >
2008-07-02 16:49:52 +02:00
Gary Jennejohn
a7a5982cd0
Add logos for RRvision board
...
Signed-off-by: Gary Jennejohn <garyj@denx.de >
2008-07-02 16:36:35 +02:00
Esben Haabendal
ee4ae38342
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 >
2008-07-01 23:44:22 +02:00
Steven A. Falco
f6a69559d6
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 >
2008-07-01 23:06:53 +02:00
Steven A. Falco
75678c807a
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 >
2008-07-01 23:03:14 +02:00
Kumar Gala
4928e97c85
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 >
2008-07-01 21:47:12 +02:00