Wolfgang Denk
1f1554841a
Merge branch 'master' of /home/wd/git/u-boot/custodians
...
Conflicts:
include/configs/socrates.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-27 12:56:01 +02:00
Sergei Poselenov
791e1dba8d
Socrates: Added USB support.
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-27 12:53:40 +02:00
Sergei Poselenov
5a904e5637
USB: add new configuration variable CONFIG_PCI_OHCI_DEVNO
...
In case of several PCI USB controllers on a board this variable
specifys which controller to use.
See doc/README.generic_usb_ohci for details.
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-27 12:53:34 +02:00
Sergei Poselenov
2f7468aeba
Socrates: add support for DS75 Digital Thermo Sensor on I2C bus.
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-27 12:51:25 +02:00
Sergei Poselenov
83e9d7a261
Socrates: Config file cleanup.
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-27 12:51:00 +02:00
Jean-Christophe PLAGNIOL-VILLARD
602cac1389
MAKEALL: add at91 list
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-24 12:58:36 +02:00
Jean-Christophe PLAGNIOL-VILLARD
42fd5f87b1
Merging Stelian Pop AT91 patches
...
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/at91sam9260ek/Makefile
Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
Delete no more needed ld script
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-24 12:56:53 +02:00
Ron Madrid
290ef64368
Add Marvell 88E1118 support for TSEC
...
Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2008-05-23 20:25:19 -07:00
Jens Gehrlein
557b377d8b
smc911x: add 16 bit support
...
Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2008-05-22 23:10:01 -07:00
Christian Eggers
6324e5bec8
Fix endianess conversion in usb_ohci.c
...
Sorry, I forgot this line:
Signed-off-by: Christian Eggers <ceggers@gmx.de>
I think this must be swapped (result may be equal).
2008-05-22 17:56:46 +02:00
Christian Eggers
c918261c6d
USB: replace old swap_ with proper endianess conversion macros
...
Signed-off-by: Christian Eggers <ceggers@gmx.de>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
2008-05-22 17:29:32 +02:00
Christian Eggers
fb63939b4f
Fix endianess conversion in usb_ohci.c
...
Signed-off-by: Christian Eggers <ceggers@gmx.de>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
2008-05-22 17:14:17 +02:00
Sergei Poselenov
477434c63c
USB: add support for multiple PCI OHCI controllers
...
Add new configuration variable CONFIG_PCI_OHCI_DEVNO.
In case of several PCI USB controllers on a board this variable
specifys which controller to use.
Also add USB support for sokrates board.
See doc/README.generic_usb_ohci for details.
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
2008-05-22 17:12:48 +02:00
Stefan Roese
97f7d27c8e
Merge branch 'quad100hd'
2008-05-21 17:39:24 +02:00
Wolfgang Denk
2c8d41969b
Merge branch 'master' of git://git.denx.de/u-boot-testing
2008-05-21 17:06:45 +02:00
Wolfgang Denk
ce6754df61
Fix some whitespace issues
...
introduced by 53677ef18
"Big white-space cleanup."
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-21 16:56:08 +02:00
Wolfgang Denk
0ad4770f8e
Merge branch 'socrates' of /home/wd/git/u-boot/projects
2008-05-21 01:13:52 +02:00
Wolfgang Denk
eddc7c46c6
Merge branch 'lwmon5' of /home/wd/git/u-boot/projects
2008-05-21 01:13:39 +02:00
York Sun
4416603aeb
Make ads5121 out-of-tree compiling safe
...
Reuse the existing DIU driver in board/freescale/common.
Signed-off-by: York Sun <yorksun@freescale.com>
2008-05-21 00:54:37 +02:00
York Sun
0e1bad47cd
Adding DIU support for Freescale 5121ADS
...
Add DIU and cfb console support to FSL 5121ADS board.
Use #define CONFIG_VIDEO in config file to enable fb console.
Signed-off-by: York Sun <yorksun@freescale.com>
2008-05-21 00:54:36 +02:00
York Sun
a48ff68d23
Replace DPRINTF with debug
...
Remove DPRINTF macro and replace it with generic debug macro.
Signed-off-by: York Sun <yorksun@freescale.com>
2008-05-21 00:54:36 +02:00
York Sun
3b80c5f574
Move pixel clock setting to board file
...
The clock divider has different format in 5121 and 8610. This patch moves it to
board specific code.
Signed-off-by: York Sun <yorksun@freescale.com>
2008-05-21 00:54:36 +02:00
Wolfgang Denk
53677ef18e
Big white-space cleanup.
...
This commit gets rid of a huge amount of silly white-space issues.
Especially, all sequences of SPACEs followed by TAB characters get
removed (unless they appear in print statements).
Also remove all embedded "vim:" and "vi:" statements which hide
indentation problems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-21 00:14:08 +02:00
Sergei Poselenov
2f845dc2bd
socrates: fix second TSEC configuration (it is actually TSEC3)
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-20 23:27:52 +02:00
Sergei Poselenov
793670c3c0
Fixed reset for socrates
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-20 23:27:50 +02:00
Sergei Poselenov
e18575d5f5
socrates: changes to support FDT
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-20 23:27:49 +02:00
Sergei Poselenov
5d108ac8f4
Initial support for "Socrates" board
...
Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
2008-05-20 23:27:46 +02:00
Yuri Tikhonov
0e15ddd11f
POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the GD_FLG_LOGINIT flag in gd->flags.
...
This way we become able to utilize the full post_log_word for POST
activities (overwise, POST ECC, which has 0x8000 ID, could be
erroneously treated as started in post_output_backlog() even if there
was actually no POST ECC run (because of OCM POST failure, for
example).
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
2008-05-20 23:24:38 +02:00
Yuri Tikhonov
7845d49094
POST: mark OCM test as POST_STOP
...
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
2008-05-20 23:24:38 +02:00
Yuri Tikhonov
28a3850658
POST: add POST_STOP flag
...
Don't run futher tests in case of a test fails that is marked as
POST_STOP.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
2008-05-20 23:24:37 +02:00
Yuri Tikhonov
a525145d81
POST: switch CFG_POST_OCM with CFG_POST_CODEC (workaround)
...
Switch the OCM testid with the codec one. The reason is that current
implementation requires the POST_ROM testid to fit into lower 16
bits, and the codec test will never run with POST_ROM hopefully.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
2008-05-20 23:24:37 +02:00
Yuri Tikhonov
8b96c788d5
lwmon5: enable OCM post test on lwmon5 board
...
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
2008-05-20 23:24:37 +02:00
Yuri Tikhonov
6e8ec68226
POST: OCM test added.
...
Added OCM test to POST layer. This version runs before all other tests
but doesn't yet interrupt post sequence on failure.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
2008-05-20 23:24:37 +02:00
Yuri Tikhonov
6891260bdd
POST: typo fix
...
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
2008-05-20 23:22:52 +02:00
Hebbar
727f633346
common/usb.c: fix incorrect escape sequence
...
Signed off by: Gururaja Hebbar <gururajakr@sanyo.co.in>
2008-05-20 11:28:09 +02:00
York Sun
4ce1e23b5e
Fix 8313ERDB board configuration
...
Change LCRR clock ratio from 2 to 4 to commodate VSC7385.
Correct TSEC1 vs TSEC2 assignment.
Define ETHADDR and ETH1ADDR always.
Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
2008-05-19 23:04:24 +02:00
Jon Loeliger
2c289e320d
mpc86xx: Removed unused and unconfigured memory test code.
...
Besides, other common code exists.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2008-05-19 09:47:25 -05:00
Wolfgang Denk
180a90abda
Release v1.3.3
...
Update CHANGELOG for release.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-19 12:47:11 +02:00
Wolfgang Denk
a734c06bf7
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
2008-05-19 09:42:38 +02:00
Stefan Roese
16bedc661d
ppc4xx: Canyonlands: Disable PCIe0/SATA in dev-tree depending on selection
...
When SATA is selected (via jumper J6) we need to disable the first PCIe
node in the device tree, so that Linux doesn't initialize it. Otherwise
the Linux SATA driver will fail to detect the devices.
The same goes the other way around too. So if PCIe is selected we need
to disable the SATA node in the device tree.
This is because PCIe port 0 and SATA on 460EX share the same pins
(multiplexed) and we have to configure in U-Boot which peripheral is
enabled.
Signed-off-by: Stefan Roese <sr@denx.de>
2008-05-19 07:14:38 +02:00
Jean-Christophe PLAGNIOL-VILLARD
3cc27b426a
i386: Fix multiple definitions of __show_boot_progress
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:59:20 +02:00
Jean-Christophe PLAGNIOL-VILLARD
311f344693
sc530_spunk: add missing SOBJS entry
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:57:39 +02:00
Jean-Christophe PLAGNIOL-VILLARD
a559317143
sc520_spunk: Fix flash
...
flash.c:593: warning: dereferencing type-punned pointer will break strict-aliasing rules
flash.c:398: error: label at end of compound statement
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:56:49 +02:00
Jean-Christophe PLAGNIOL-VILLARD
91f221317a
drivers/pcmcia: add missing i82365
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:40:08 +02:00
Jean-Christophe PLAGNIOL-VILLARD
dd22394413
i386/bootm: remove unused var
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:37:26 +02:00
Jean-Christophe PLAGNIOL-VILLARD
a9da341df1
example/gitignore: update with all generated examples
...
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-19 00:29:35 +02:00
Wolfgang Denk
a38dc3ea86
TQM8272: fix out-of-tree building
...
...and add to MAKEALL script
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-15 00:42:45 +02:00
Wolfgang Denk
4f805c1e3a
environment: fix bug introduced by commit a8409f4f1a
...
env_get_char is not a function, but a pointer to one.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-14 23:36:10 +02:00
Wolfgang Denk
35fca4c44d
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
2008-05-14 14:05:49 +02:00
Gary Jennejohn
0c11935cd6
ppc4xx: QUAD100HD: Allow the environment to be put into flash.
...
After moving TEXT_BASE the value for CFG_ENV_ADDR was incorrect. Also
use a redundant environment.
Signed-off-by: Gary Jennejohn <garyj@denx.de>
2008-05-14 14:02:42 +02:00