summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2009-12-21-132/+2245
|\
| * usb: write command for RAW partition.Mahavir Jain2009-12-20-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements write support to usb device with raw partition. It will be useful for filesystem write support to usb device from u-boot in future. Tested with writing kernel image to raw usb disk & booting with usb read command into ram. [Note: run usb part to get info about start sector & number of sectors on a partition for usb write operation.] Signed-off-by: Mahavir Jain <mjain@marvell.com>
| * omap3evm: musb: add USB configAjay Kumar Gupta2009-12-20-0/+39
| | | | | | | | | | | | | | Added USB host and device config for host (MSC, Keyboard) and device (ACM) functionalities. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
| * OMAP3 USB Initialize twl4030 only if requiredTom Rix2009-12-20-1/+6
| | | | | | | | | | | | | | OMAP3EVM uses ISP1504 phy and so twl4030 related init is not required. Submitted-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * OMAP3 zoom2 Use usbtty if the debug board is not connected.Tom Rix2009-12-20-4/+37
| | | | | | | | | | | | | | | | | | | | The preferred serial output comes from the debug board. When the debug board is disconnected, fall back on using usbtty from the usb connector on the Zoom2 board. This shows up as /dev/ttyACM0 in a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * USBTTY make some function declarations easier to use.Tom Rix2009-12-20-0/+6
| | | | | | | | | | | | | | | | | | Zoom2 needs to use these declarations and the include directory is a better place from them than in the middle of the driver directory. It did not make sense to create a new file for just a couple of lines so they were appended to the serial.h Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * OMAP3 beagle Add usbtty configurationTom Rix2009-12-20-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary console of beagle is the serial header. A secondary console is to use the usbtty. The user can set this manually by doing setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty saveenv usbtty will be usable by accessing the /dev/ttyACM0 on a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * OMAP3 zoom1 Add usbtty configurationTom Rix2009-12-20-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary console of zoom1 is the serial out from the jumpers accessed by removing the back panel. A secondary console is to use the usbtty. The user can set this manually by doing setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty saveenv usbtty will be usable by accessing the /dev/ttyACM0 on a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * OMAP3 Add usb device supportTom Rix2009-12-20-3/+1451
| | | | | | | | | | | | | | | | | | | | | | | | This change adds the usb device support for musb. Omap3 platform support added at the same level as davinci. The interface for usbtty to use the musb device support was added. Verified on omap3 beagle, zoom1 and zoom2. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * TWL4030 Add usb PHY supportTom Rix2009-12-20-15/+362
| | | | | | | | | | | | | | | | | | | | The twl4030 provides a PHY device for connecting a link device, like musb, to physical connection. This change adds the twl4030 usb registers and functions for initializing the PHY as required by omap3. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * USB add macros for debugging usb device setup.Tom Rix2009-12-20-0/+129
| | | | | | | | | | | | | | When developing usb device features, it is useful to print out common usb structures. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
| * USB Consolidate descriptor definitionsTom Rix2009-12-20-110/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header files usb.h and usbdescriptors.h have the same nameed structure definitions for usb_config_descriptor usb_interface_descriptor usb_endpoint_descriptor usb_device_descriptor usb_string_descriptor These are out right duplicates in usb.h usb_device_descriptor usb_string_descriptor This one has extra unused elements usb_endpoint_descriptor unsigned char bRefresh unsigned char bSynchAddress; These in usb.h have extra elements at the end of the usb 2.0 specified descriptor and are used. usb_config_descriptor usb_interface_descriptor The change is to consolidate the definition of the descriptors to usbdescriptors.h. The dublicates in usb.h are removed. The extra element structure will have their name shorted by removing the '_descriptor' suffix. So usb_config_descriptor -> usb_config usb_interface_descriptor -> usb_interface For these, the common descriptor elements are accessed now by an element 'desc'. As an example - if (iface->bInterfaceClass != USB_CLASS_HUB) + if (iface->desc.bInterfaceClass != USB_CLASS_HUB) This has been compile tested on MAKEALL arm, ppc and mips. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
* | Merge branch 'next' of git://git.denx.de/u-boot-netWolfgang Denk2009-12-17-389/+452
|\ \
| * | Net: Clean up LAN91C96 SupportBen Warren2009-12-14-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | A previous Commit converted the LAN91C96 Ethernet driver to using the CONFIG_NET_MULTI API, but did not include full board support. This patch finishes the job. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: dm9000x: fix debug outputThomas Weber2009-12-13-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | commit 60f61e6d7655400bb785a2ef637581679941f6d1 breaks compile with gcc by introducing __func__ instead of constant string "func" in the macro call but missed to change the macro. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | fec_mxc: incomplete error handlingJohn Ogness2009-12-13-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fec_init() will only allocate fec->base_ptr if it is non-NULL. But the cleanup routine on error will free the pointer without setting it to NULL. This means that a later call to fec_init() would result in using an invalid pointer. Signed-off-by: John Ogness <john.ogness@linutronix.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: e1000: Add support for the Intel 82546GB controllerReinhard Arlt2009-12-13-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This chip is equipped for example on the esd PMC-ETH2-GB board. So let's add it to the list of supported chips to the e1000 driver. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Add error codes/handling for TFTP-serverRemy Bohmer2009-12-13-3/+29
| | | | | | | | | | | | | | | Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | LAN91C96: Enable NET_MULTI LAN driverNishanth Menon2009-12-13-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | TI OMAP3: SDP3430 FIX NET_MULTI WarningNishanth Menon2009-12-13-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the NET MULTI option and remove build warning Tested: SDP3430 Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | NET: LAN91C96 CONFIG_NET_MULTIifyNishanth Menon2009-12-13-329/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function Most of the formatting change was done to keep checkpatch silent, but a few functions and #if 0ed code which does not make sense for NET_MULTI have been removed Now, use the lan91c96_initialize() function to init the driver Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: pull CONFIG checks out of source and into makefileMike Frysinger2009-12-13-30/+9
| | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | Update Makefile for tag generatingLi Yang2009-12-17-41/+7
| | | | | | | | | | | | | | | | | | Get tag directories from the $(__LIB) and also generate tag for .S files. Signed-off-by: Li Yang <leoli@freescale.com>
* | | drivers/bios_emulator: Fix compile error in .depend not being generatedKumar Gala2009-12-17-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | make -C drivers/bios_emulator/ make[2]: Entering directory `drivers/bios_emulator' In file included from atibios.c:49: biosemui.h:47:21: error: biosemu.h: No such file or directory ... x86emu/decode.c:40:28: error: x86emu/x86emui.h: No such file or directory ... Due to lack of proper CPPFLAGS being passed to .depend generation rule Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'next' of ../nextWolfgang Denk2009-12-15-15591/+9745
|\ \ | |/
| * common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOULHeiko Schocher2009-12-08-239/+7
| | | | | | | | | | | | | | | | | | There is more and more usage of printing 64bit values, so enable this feature generally, and delete the CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL defines. Signed-off-by: Heiko Schocher <hs@denx.de>
| * 5xxx, fdt: move fdt_fixup_memory() to cpu.c fileHeiko Schocher2009-12-08-14/+2
| | | | | | | | | | | | | | | | u-boot updates, before starting Linux, the memory node in the DTS. As this is a "standard" feature, move this functionality to the cpu.c file for mpc5xxx and mpc512x processors. Signed-off-by: Heiko Schocher <hs@denx.de>
| * Merge branch 'master' of ../work into nextWolfgang Denk2009-12-07-10/+1202
| |\
| * | mpc52xx, manroland: add some commandsHeiko Schocher2009-12-07-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the following commands for the manroland boards: CONFIG_CMDLINE_EDITING CONFIG_COMMAND_HISTORY CONFIG_AUTO_COMPLETE Signed-off-by: Heiko Schocher <hs@denx.de>
| * | Merge branch 'master' into nextWolfgang Denk2009-12-07-21/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | POST: Remove duplicated post_hotkey_pressed() functionsStefan Roese2009-12-07-232/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a weak default function for post_hotkey_pressed(), returning 0, for boards without hotkey support. The long-running tests won't be started on those boards. This default function was implemented in many board directories. By implementing this weak default we can remove all those duplicate versions. Boards with hotkey support, can override this weak default function by defining one in their board specific code. Signed-off-by: Stefan Roese <sr@denx.de>
| * | | Merge branch 'master' into nextWolfgang Denk2009-12-05-566/+817
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | zlib: Optimize decompressionJoakim Tjernlund2009-12-05-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch optimizes the direct copy procedure. Uses get_unaligned() but only in one place. The copy loop just above this one can also use this optimization, but I havn't done so as I have not tested if it is a win there too. On my MPC8321 this is about 17% faster on my JFFS2 root FS than the original. No speed test has been performed in u-boot. Size increase on ppc: 484 bytes Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se> Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
| * | | | add lzop decompression supportPeter Korsgaard2009-12-05-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lzop decompression support to the existing lzo bitstream handling (think gzip versus zlib), and support it for uImage decompression if CONFIG_LZO is enabled. Lzop doesn't compress as good as gzip (~10% worse), but decompression is very fast (~0.7s faster here on a slow ppc). The lzop decompression code is based on Albin Tonnerre's recent ARM Linux lzo support patch. Cc: albin.tonnerre@free-electrons.com Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| * | | | Generic udelay() with watchdog supportIngo van Lil2009-12-05-62/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the PPC reference implementation the udelay() function is responsible for resetting the watchdog timer as frequently as needed. Most other architectures do not meet that requirement, so long-running operations might result in a watchdog reset. This patch adds a generic udelay() function which takes care of resetting the watchdog before calling an architecture-specific __udelay(). Signed-off-by: Ingo van Lil <inguin@gmx.de>
| * | | | i386: Final RelocationGraeme Russ2009-12-05-212/+158
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Move references to link script exportsGraeme Russ2009-12-05-17/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Remove inline asm symbols from .dynsymGraeme Russ2009-12-05-0/+80
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Rearrange Interupt HandlingGraeme Russ2009-12-05-310/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preperation for full relocation Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Fix race condition when using SC520 timersGraeme Russ2009-12-05-5/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Fix global label in inline asm compile errorGraeme Russ2009-12-05-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Reorder source objects in lib_i386 MakefileGraeme Russ2009-12-05-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Fix link collisions resulting from gcc4.4.1 upgradeGraeme Russ2009-12-05-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Fix malloc initializationGraeme Russ2009-12-05-17/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | i386: Fix dlmalloc compile warningGraeme Russ2009-12-05-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
| * | | | crc32: Impl. linux optimized crc32()Joakim Tjernlund2009-12-02-88/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported over the more efficient linux crc32() function. A quick comparsion on ppc: After changing the old crc32 to do 4 bytes in the inner loop to be able to compare with new version one can note: - old inner loop has 61 insn, new has 19 insn. - new crc32 does one 32 bit load of data to crc while the old does four 8 bits loads. - size is bit bigger for the new crc32: 1392(old) 1416(new) of text. The is because the new version shares code with crc32_no_comp() instead of duplicating code. - about 33% faster on ppc: New > crc 0 0xfffffff -> 39 secs Old > crc 0 0xfffffff -> 60 secs Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
| * | | | makefiles: fixes for building build toolsScott Wood2009-12-02-123/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, some of the tools instead set CC to be HOSTCC in order to re-use some pattern rules -- but this fails when the user overrides CC on the make command line. Also, the HOSTCFLAGS in tools/Makefile are currently not being used because config.mk overwrites them. This patch adds static pattern rules for files that have been requested to be built with the native compiler using $(HOSTSRCS) and $(HOSTOBJS), and converts the tools to use them. It restores easylogo to using the host compiler, which was broken by commit 38d299c2db81bd889c601b5dfc12c4e83ef83333 (if this was an intentional change, please let me know -- but it seems to be a build tool). It restores -pedantic and the special flags for darwin and cygwin that were requested in tools/makefile (but keeps the flags added by config.mk) -- hopefully someone can test this on those platforms. It no longer conditionalizes -pedantic on not being darwin; it wasn't clear that that was intentional, and unless there's a real problem it's just inviting people to contribute non-pedantic patches to those files (I'm not a fan of -pedantic personally, but if it's on for one platform it should be on for all). HOST_LDFLAGS is renamed HOSTLDFLAGS for consistency with the previous HOST_CFLAGS to HOSTCFLAGS rename. A new HOSTCFLAGS_NOPED is made available for those files which currently cannot be built with -pedantic, and replaces the old FIT_CFLAGS. imls now uses the cross compiler properly, rather than by trying to reconstruct CC using the typoed $(CROSS_COMPILER). envcrc.c is now dependency-processed unconditionally -- previously it would be built without being on (HOST)SRCS if CONFIG_ENV_IS_EMBEDDED was not selected. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | | | exports: rewrite jump table initMike Frysinger2009-12-02-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current jump table init fails to initialize a bunch of exported symbols (forceenv/do_reset/etc...). Rather than fix just these few missing pieces, rewrite the code to utilize the existing list of exported symbols -- _exports.h. Since every exported symbol has to be listed in this header, it makes sense to use it so that we only ever have one list that needs to be updated and things can't fall out of sync again. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into nextWolfgang Denk2009-12-01-873/+5261
| |\ \ \ \
| | * | | | ARM Update mach-typesTom Rix2009-11-29-0/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetched from http://www.arm.linux.org.uk/developer/machines/download.php And built with repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm commit 3fcca9ac6cbce35b3e81e247d375534117d5f4cd Signed-off-by: Tom Rix <Tom.Rix@windriver.com>