summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xxWolfgang Denk2008-01-12-59/+68
|\
| * Merge commit 'wd/master'Jon Loeliger2008-01-10-1483/+7392
| |\
| * | 86xx: Support 2GB DIMMsBecky Bruce2008-01-10-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Configure the number of bits used to address the banks inside the SDRAM device. The default register value of 0 means 2 bits to address 4 banks. Higher capacity devices like a 2GB DIMM require 3 bits to address 8 banks. Signed-off-by: Becky Bruce <bgill@freescale.com>
| * | 86xx: Remove cache config from configs.hJon Loeliger2008-01-09-7/+0
| | | | | | | | | | | | | | | | | | Just use the standard defines in asm/cache.h. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | Convert MPC8610HPCD to use libfdt.Jon Loeliger2008-01-09-50/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | Assumes the presence of the aliases node in the DTS to locate the pci and serial nodes for fixups. Use consistent fdtaddr and fdtfile in environment variables. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | 8610: Fix lingering compile warnings.Jon Loeliger2008-01-09-1/+4
| | | | | | | | | | | | | | | | | | Turn off DEBUG. Signed-off-by: Jon Loeliger <jdl@freescale.com>
* | | Merge ../custodiansWolfgang Denk2008-01-11-0/+2
|\ \ \
| * | | Nios2: remove common/cmd_bdinfo.c unused variable.Jean-Christophe PLAGNIOL-VILLARD2008-01-10-0/+2
| | |/ | |/| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* | | Fix compiler warningKumar Gala2008-01-11-1/+1
|/ / | | | | | | | | | | | | main.c: In function 'readline_into_buffer': main.c:927: warning: unused variable 'p_buf' Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Fix Ethernet init() return codesBen Warren2008-01-10-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change return values of init() functions in all Ethernet drivers to conform to the following: >=0: Success <0: Failure All drivers going forward should return 0 on success. Current drivers that return 1 on success were left as-is to minimize changes. Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-By: Timur Tabi <timur@freescale.com>
* | Coding Style cleanup; update CHANGELOGWolfgang Denk2008-01-10-36/+407
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk2008-01-10-1210/+4309
|\ \
| * | Add QE brg freq and correct qe bus freq fdt update codeKim Phillips2008-01-09-1/+3
| | | | | | | | | | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | Remove cache config from ATUM8548 and sbc8548 configsAndy Fleming2008-01-09-14/+0
| | | | | | | | | | | | | | | | | | | | | These boards weren't updated by Kumar's config patch because they weren't in the tree, yet. Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | 85xx: add ability to upload QE firmwareTimur Tabi2008-01-09-2/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the layout of a binary blob that contains a QE firmware and instructions on how to upload it. Add function qe_upload_firmware() to parse the blob and perform the actual upload. Add command-line command "qe fw" to take a firmware blob in memory and upload it. Update ft_cpu_setup() on 85xx to create the 'firmware' device tree node if U-Boot has uploaded a firmware. Fully define 'struct rsp' in immap_qe.h to include the actual RISC Special Registers. Signed-off-by: Timur Tabi <timur@freescale.com>
| * | 85xx: Remove cache config from configs.hKumar Gala2008-01-09-120/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Either use the standard defines in asm/cache.h or grab the information at runtime from the L1CFG SPR. Also, minor cleanup in cache.h to make the code a bit more readable. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | mpc85xx: Add support for ATUM8548 (updated)robert lazarski2008-01-09-0/+744
| | | | | | | | | | | | | | | | | | | | | Add support for Instituto Atlantico's ATUM8548 board Signed-off-by: robert lazarski <robertlazarski@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mpc85xx: Add support for ATUM8548 (updated)robert lazarski2008-01-09-0/+649
| | | | | | | | | | | | | | | | | | Add support for Instituto Atlantico's ATUM8548 board Signed-off-by: robert lazarski <robertlazarski@gmail.com>
| * | mpc85xx: Add support for SBC8548 (updated)Joe Hamman2008-01-09-0/+752
| | | | | | | | | | | | | | | | | | Add support for Wind River's SBC8548 reference board. Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
| * | mpc85xx: Add support for SBC8548 (updated)Joe Hamman2008-01-09-0/+902
| | | | | | | | | | | | | | | | | | | | | Add support for Wind River's SBC8548 reference board. Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com> Signed-off by: Andy Fleming <afleming@freescale.com>
| * | MPC8568E-MDS: set up QE pario for UART1Anton Vorontsov2008-01-09-0/+7
| | | | | | | | | | | | | | | | | | | | | To use UART1 on the MPC8568E-MDS, QE pario pins PC[0:3] should be set up appropriately. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
| * | MPC8568E-MDS: reset UCCs to use them reliablyAnton Vorontsov2008-01-09-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to use GETH1 and GETH2 on the MPC8568E-MDS, we should reset UCCs. p.s Similar code exists in the Linux kernel board file (for capability reasons with older U-Boots), but should be removed some day. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
| * | Reworked FSL Book-E TLB macros to be more readableKumar Gala2008-01-09-1034/+809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old macros made it difficult to know what WIMGE and perm bits were set for a TLB entry. Actually use the bit masks for these items since they are only a single bit. Also moved the macros into mmu.h out of e500.h since they aren't specific to e500. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | Use FSL Book-E MMU macros from Linux KernelKumar Gala2008-01-09-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | Grab the FSL Book-E MAS register macros from Linux. Also added defines for page sizes up to 4TB and removed SHAREN since it doesnt really exist. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-01-09-34/+29
|\ \ \
| * | | Fix my own merge stupidityAndy Fleming2008-01-09-34/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Way back in August I merged Heiko's patch: 566a494f592: [PCS440EP] upgrade the PCS440EP board with Jon's CONFIG_COMMANDS patches. This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 However, in the process, I left out some of Heiko's good changes. Now Heiko's and Jon's patches are properly merged in fat_register_device() Signed-off-by: Andy Fleming <afleming@freescale.com>
* | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-01-09-4/+2539
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://www.denx.de/git/u-boot-freebsdWolfgang Denk2008-01-09-4/+2539
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | API for external applications.Rafal Jaworowski2008-01-09-0/+2537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an API for external (standalone) applications running on top of U-Boot, and is meant to be more extensible and robust than the existing jumptable mechanism. It is similar to UNIX syscall approach. See api/README for more details. Included is the demo application using this new framework (api_examples). Please note this is still an experimental feature, and is turned off by default. Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
| | * | | Globalize envmatch()Rafal Jaworowski2008-01-09-4/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | The newly introduced API (routines related to env vars) will need to call it. Signed-off-by: Rafal Zabdyr <armo@semihalf.com>
* | | | Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-01-09-10/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Expose parse_line() globally.James Yang2008-01-09-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new function readline_into_buffer() that allows the output of readline to be put into a pointer to char buffer. This refactoring allows other functions besides the main command loop to also use the same input mechanism. Signed-off-by: James Yang <James.Yang@freescale.com> Acked-by: Jon Loeliger <jdl@freescale.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-usbWolfgang Denk2008-01-09-0/+17
|\ \ \ | |/ / |/| |
| * | Add Ctrl combo key support to usb keyboard driver.Zhang Wei2008-01-09-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ctrl combo key support is added, which is very useful to input Ctrl-C for interrupt current job. Also add usb_event_poll() calling to usb_kbd_testc(), which can get key input when tstc() is called. Signed-off-by: Zhang Wei <wei.zhang@freescale.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * | Merge git://www.denx.de/git/u-bootMarkus Klotzbuecher2008-01-09-11881/+42644
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: board/tqm5200/tqm5200.c
| * | | TQM5200: Call usb_cpu_init() during board initMarian Balakowicz2007-10-31-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usb_cpu_init() configures GPS USB pins, clocks, etc. and is required for proper operation of kernel USB subsystem. This setup was previously done in the kernel by the fixup code which is being removed, thus low level init must be done by U-boot now. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * | | Fix the issue of usb_kbd driver missing the scan code of key 'z'.Zhang Wei2007-10-31-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scan code of the key 'z' is 0x1d, which should be handled. The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI controller. Signed-off-by: Zhang Wei <wei.zhang@freescale.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * | | PXA USB OHCI: "usb stop" implementation.Rodolfo Giometti2007-10-31-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some USB keys need to be switched off before loading the kernel otherwise they can remain in an undefined status which prevents them to be correctly recognized by the kernel. Signed-off-by: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* | | | trivial: fix consequences of a bad mergeGuennadi Liakhovetski2008-01-09-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix what looks like a merge artifact. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | | | Add Ctrl combo key support to usb keyboard driver.Zhang Wei2008-01-09-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ctrl combo key support is added, which is very useful to input Ctrl-C for interrupt current job. Also add usb_event_poll() calling to usb_kbd_testc(), which can get key input when tstc() is called. Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
* | | | fix various commentsMarcel Ziswiler2008-01-09-26/+25
| | | | | | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
* | | | fix comments with new drivers organizationMarcel Ziswiler2008-01-09-30/+31
| | | | | | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
* | | | Remove the obsolete terse version of do_mii()Shinya Kuribayashi2008-01-09-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have more useful version of do_mii() and everybody use it. Gerald Van Baren says: > When I originally wrote the mii command 6(!) years ago, I wrote a > verbose version that printed human readable decomposition of the flags, > etc., and a terse one that didn't print as much stuff and thus had a > smaller memory footprint. > > It sounds like the terse version has withered and died, apparently > people are only using the verbose version (which is very understandable, > I do myself). Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
* | | | Do not reference sha1.c when building mkimage.Mike Frysinger2008-01-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | remove sha1.o from mkimage linking since it isn't actually used. Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
* | | | common/cmd_mii.c: Add sanity argc checkShinya Kuribayashi2008-01-09-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If type mii command without arguments, we suffer from uninitialized argv[] entries; for example we MIPS get stuck by TLB error. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
* | | | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-01-09-5055/+12462
|\ \ \ \ | | |_|/ | |/| |
| * | | Coding Style cleanup, update CHANGELOGWolfgang Denk2008-01-09-326/+427
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | fix easylogo on big endian dev systemsMike Frysinger2008-01-09-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | didnt realize how out of shape easylogo actually was until i tried using it. this patch does byte swapping as need be on the input tga header since the tga is in little endian but the host could just as well be big endian. i didnt bother using bswap macros or such stuff from system headers as nothing in POSIX dictates byte swapping functionality. Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
| * | | cleanup easylogoMike Frysinger2008-01-09-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make the Makefile not suck - include proper headers for prototypes - fix obvious broken handling of strchr() when handling '.' in filenames Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
| * | | Fix build problems under Cygwinraptorbrino@aim.com2008-01-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows u-boot to build without error in a cygwin environment. Cygwin does not define __u64 in it's include/asm/types.h file. The -idirafter flag in the u-boot build causes the inclusion of the cygwin types.h file as opposed to u-bot/include/asm/types.h file which does define __u64. Subsequently, sha1.c compile fails due to unknown symbol. Signed-off-by: Brian Miller <raptorbrino@netscape.net>