summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* evb64260: fix "cast to pointer from integer of different size" warningsWolfgang Denk2008-12-092-3/+7
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-12-095-19/+30
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2008-12-095-19/+30
| |\
| | * USB: descriptor handlingStefan Althoefer2008-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, I found a bug when working with the u-boot USB subsystem on IXP425 processor (big endian Xscale aka ARMv5). I recognized that the second usb_endpoint_descriptor of the attached memory stick was corrupted. The reason for this are the packed structures below (either u-boot and u-boot-usb): -------------- /* Endpoint descriptor */ struct usb_endpoint_descriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned char bEndpointAddress; unsigned char bmAttributes; unsigned short wMaxPacketSize; unsigned char bInterval; unsigned char bRefresh; unsigned char bSynchAddress; } __attribute__ ((packed)); /* Interface descriptor */ struct usb_interface_descriptor { unsigned char bLength; unsigned char bDescriptorType; unsigned char bInterfaceNumber; unsigned char bAlternateSetting; unsigned char bNumEndpoints; unsigned char bInterfaceClass; unsigned char bInterfaceSubClass; unsigned char bInterfaceProtocol; unsigned char iInterface; unsigned char no_of_ep; unsigned char num_altsetting; unsigned char act_altsetting; struct usb_endpoint_descriptor ep_desc[USB_MAXENDPOINTS]; } __attribute__ ((packed)); ------------ As usb_endpoint_descriptor is only 7byte in length, the start of all odd ep_desc[] structures is not word aligned. This makes wMaxPacketSize of these structures also not word aligned. ARMv5 Architecture however does not support non-aligned multibyte data type (see A2.8 of ARM Architecture Reference Manual). Signed-off-by: Stefan Althoefer <stefan.althoefer@web.de> Signed-off-by: Remy Böhmer <linux@bohmer.net>
| | * usbtty/omap: update to current APIJean-Christophe PLAGNIOL-VILLARD2008-12-094-18/+29
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Remy Böhmer <linux@bohmer.net>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-12-091-2/+0
|\ \ \ | |/ /
| * | video: fix FADS823 and RRvision compiling issuesAnatolij Gustschin2008-12-091-2/+0
| |/ | | | | | | | | | | | | | | Since commit 561858ee building for FADS823 and RRvision doesn't work. Let's include version.h and timestamp.h unconditionally to fix the problem. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | drivers/fsl_pci_init: Fix compile warningKumar Gala2008-12-091-0/+2
|/ | | | | | | | | fsl_pci_init.c: In function 'fsl_pci_setup_inbound_windows': fsl_pci_init.c:122: warning: comparison is always true due to limited range of data type The check only makes sense if we are CONFIG_PHYS_64BIT Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Merge branch 'master' of git://git.denx.de/u-boot-at91Wolfgang Denk2008-12-098-20/+154
|\
| * Remove redundant armv4 flag from arm926ejs compile flagsRemy Bohmer2008-12-062-2/+1
| | | | | | | | | | | | | | Currently the arm926ejs tree has the armv4 option set during compilation. This flag does not belong here because a arm926 CPU is always a armv5 CPU. Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * at91: Choose environment variables location within make config targetNicolas Ferre2008-12-066-18/+153
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds the possiblity to choose the media where the environment will be located. This allow to choose this fundamental configuration without editing config files. Documentation file added. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Stelian Pop <stelian@popies.net> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2008-12-096-13/+30
|\ \
| * | net: Fix TftpStart() ip:filename bugPeter Tyser2008-12-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TftpStart() function modifies the 'BootFile' string when 'BootFile' contains both an IP address and filename (eg 1.2.3.4:/path/file). This causes subsequent calls to TftpStart to incorrectly parse the TFTP filename and server IP address to use. For example: => tftp 0x100000 10.52.0.62:/home/ptyser/non_existant Speed: 100, half duplex Using eTSEC1 device TFTP from server 10.52.0.62; our IP address is 10.52.253.79 ^^^^^^^^^^ CORRECT Filename '/home/ptyser/non_existant'. ^^^^^^^^^^^^^^^^^^^^^^^^^ CORRECT Load address: 0x100000 Loading: * TFTP error: 'File not found' (1) Starting again eTSEC2: No link. Speed: 100, half duplex Using eTSEC1 device TFTP from server 10.52.0.33; our IP address is 10.52.253.79 ^^^^^^^^^^ WRONG Filename '10.52.0.62'. ^^^^^^^^^^ WRONG Load address: 0x100000 Loading: * TFTP error: 'File not found' (1) Starting again TftpStart() was modified to not modify the 'BootFile' string. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: Add additional IP fragmentation checkPeter Tyser2008-12-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore IP packets which have the "more fragments" flag bit set. This flag indicates the IP packet is fragmented and must be ignored by U-Boot. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: Define IP flag field valuesPeter Tyser2008-12-042-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | These defines were pulled from the "Add simple IP/UDP fragmentation support" patch from Frank Haverkamp <haver@vnet.ibm.com>. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: tsec: Fix Marvell 88E1121R phy initAnatolij Gustschin2008-12-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to ensure that phy interrupt pin won't be asserted after booting. We experienced following issues with current 88E1121R phy init: Marvell 88E1121R phy can be hardware-configured to share MDC/MDIO and interrupt pins for both ports P0 and P1 (e.g. as configured on socrates board). Port 0 interrupt pin will be shared by both ports in such configuration. After booting Linux and configuring eth0 interface, port 0 phy interrupts are enabled. After rebooting without proper eth0 interface shutdown port 0 phy interrupts remain enabled so any change on port 0 (link status, etc.) cause assertion of the interrupt. Now booting Linux and configuring eth1 interface will cause permanent phy interrupt storm as the registered phy 1 interrupt handler doesn't acknowledge phy 0 interrupts. This of course should be fixed in Linux driver too. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | net: Fix download command parsingPeter Tyser2008-12-041-8/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CONFIG_SYS_HUSH_PARSER is defined network download commands with 1 argument in the format 'tftp "/path/file"' do not work as expected. The hush command parser strips the quotes from "/path/file" which causes the network commands to interpret "/path/file" as an address instead of the intended filename. The previous check for a leading quote in netboot_common() was replaced with a check which ensures only valid numbers are treated as addresses. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | Section name should be ".data", not "data"Trent Piepho2008-12-094-10/+8
| | | | | | | | | | Signed-off-by: Trent Piepho <tpiepho@freescale.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MAKEALL: Automatically use parallel buildsWolfgang Denk2008-12-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | Add logic to the MAKEALL script to determine the number of CPU cores on the system, and run a parallel build if there is more than one. Usually this significantrly accelerates builds. Allow to manually adjust the number of parallel make jobs by using the "BUILD_NCPUS" environment variable. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | vxworks.h: Fix build problem introduced by commits 29a4c24d/e9084b23Wolfgang Denk2008-12-091-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | avr32/bootm: remove unused variable 'ret'Jean-Christophe PLAGNIOL-VILLARD2008-12-081-1/+0
| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
* | Remove unneeded CONFIG_SHELL referencesPeter Tyser2008-12-082-9/+3
| | | | | | | | | | | | | | Make should be using the bash shell by default which makes CONFIG_SHELL unnecessary Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | Use bash for default GNU Make shell applicationPeter Tyser2008-12-081-1/+6
| | | | | | | | | | | | | | | | Some Make script commands rely on bash-specific features like brace expansion, so default to bash for the SHELL variable with a fallback to the standard sh shell Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | jffs2: rename devices_init () in common/jffs2.cHeiko Schocher2008-12-081-7/+7
| | | | | | | | | | | | | | | | rename devices_init () in common/jffs2.c to jffs2_devices_init (), because there is also a devices_init () in common/devices.c. Signed-off-by: Heiko Schocher <hs@denx.de>
* | SPARC: Fixed compiler error introduced by commit c160a9544743Daniel Hellstrom2008-12-071-1/+2
| | | | | | | | | | | | | | This patch fixes a build error for the SPARC platform. It was introduced by commit c160a9544743e80e8889edb2275538e7764ce334. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
* | mgsuvd add the board-specific part of the HDLC driverGary Jennejohn2008-12-072-1/+280
| | | | | | | | Signed-off-by: Gary Jennejohn <garyj@denx.de>
* | mgcoge add the board-specific part of the HDLC driverGary Jennejohn2008-12-072-1/+278
| | | | | | | | Signed-off-by: Gary Jennejohn <garyj@denx.de>
* | keymile add the common parts of the HDLC driverGary Jennejohn2008-12-072-0/+749
| | | | | | | | | | | | | | This implements the ICN protocol used across the backplane and is needed by all the keymile boards. Signed-off-by: Gary Jennejohn <garyj@denx.de>
* | drivers/bios_emulator: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD2008-12-0711-48/+2
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | common/cmd_ide.c: Corrected endian order printing for compact flash serial ↵Richard Retanubun2008-12-071-3/+4
| | | | | | | | | | | | | | | | number. Corrected endian order printing for compact flash serial number. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
* | IOMUX: Add console multiplexing support.Gary Jennejohn2008-12-077-1/+498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications to support console multiplexing. This is controlled using CONFIG_SYS_CONSOLE_MUX in the board configuration file. This allows a user to specify multiple console devices in the environment with a command like this: setenv stdin serial,nc. As a result, the user can enter text on both the serial and netconsole interfaces. All devices - stdin, stdout and stderr - can be set in this manner. 1) common/iomux.c and include/iomux.h contain the environment setting implementation. 2) doc/README.iomux contains a somewhat more detailed description. 3) The implementation in (1) is called from common/cmd_nvedit.c to handle setenv and from common/console.c to handle initialization of input/output devices at boot time. 4) common/console.c also contains the code needed to poll multiple console devices for input and send output to all devices registered for output. 5) include/common.h includes iomux.h and common/Makefile generates iomux.o when CONFIG_SYS_CONSOLE_MUX is set. Signed-off-by: Gary Jennejohn <garyj@denx.de>
* | strings: use puts() rather than printf()Mike Frysinger2008-12-071-1/+2
| | | | | | | | | | | | | | | | When running `strings` on really long strings, the stack tends to get smashed due to printf(). Switch to puts() instead since we're only passing the data through. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Use new CONFIG_SYS_VXWORKS parameters for Netstal boardsNiklaus Giger2008-12-071-15/+14
| | | | | | | | Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* | cmd_elf.c: Cleanup bootvx and handle new CONFIG_SYS_VXWORKS parametersNiklaus Giger2008-12-071-47/+30
| | | | | | | | | | | | | | | | | | | | | | | | - fix size too small by one in sprintf - changed old (pre 2004) device name ibmEmac to emac - boot device may be overriden in board config - servername may be defined in board config - additional parameters may be defined in board config - fixed some line wrappings - replaced redundant MAX define by max Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* | Add vxworks.h to handle CONFIG_SYS_VXWORKS parametersNiklaus Giger2008-12-071-0/+53
| | | | | | | | Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* | README: Document CONFIG_SYS parameters for vxworksNiklaus Giger2008-12-071-0/+18
| | | | | | | | Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* | lcd: Let the board code show board-specific info cleanupPeter Tyser2008-12-071-1/+0
| | | | | | | | | | | | | | remove unneeded version.h from lcd.c Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Update U-Boot's build timestamp on every compilePeter Tyser2008-12-0647-52/+135
| | | | | | | | | | | | | | Use the GNU 'date' command to auto-generate a new U-Boot timestamp on every compile. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | lwmon, tqm8xx: Fix build errorsAnatolij Gustschin2008-12-062-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6b59e03e0237a40a2305ea385defdfd92000978b lcd: Let the board code show board-specific info introduced some bugs which prevent U-Boot building for lwmon board if CONFIG_LCD_INFO_BELOW_LOGO will be defined in the board configuration. Also "LCD enabled" building for TQM823L doesn't work since this commit. This patch fixes above-mentioned issues. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | ignore .gdb_history filesMike Frysinger2008-12-051-0/+3
| | | | | | | | | | | | When using gdb, history files will often get generated. So ignore them. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | FPGA: move fpga drivers to drivers/fpgaJean-Christophe PLAGNIOL-VILLARD2008-12-0512-11/+59
|/ | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'master' of git://git.denx.de/u-boot-at91Wolfgang Denk2008-12-053-16/+15
|\
| * at91rm9200dk: Fix typoJean-Christophe PLAGNIOL-VILLARD2008-12-021-1/+1
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * AT91: remove non supported board AT91RM9200DF macroJean-Christophe PLAGNIOL-VILLARD2008-12-021-2/+2
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * mtd/dataflash.c: fix a problem with the last partitionIlko Iliev2008-12-021-1/+1
| | | | | | | | | | | | | | | | | | This patch fix the problem that only the [NB_DATAFLASH_AREA - 1] dataflash partition can be defined to use the area to the end of dataflash size. Now it is possible to have only one dataflash partition from 0 to the end of of dataflash size. Signed-off-by: Ilko Iliev <iliev@ronetix.at>
| * fix some coding style violations.Ilko Iliev2008-12-021-13/+12
| | | | | | | | | | | | This patch fix some coding style violations. Signed-off-by: Ilko Iliev <iliev@ronetix.at>
* | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2008-12-0512-429/+477
|\ \
| * | Remove non-ascii characters from fat codeRemy Bohmer2008-12-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code contains some non-ascii characters in comment lines and code. Most editors do not display those characters properly and editing those files results always in diffs at these places which are usually not required to be changed at all. This is error prone. So, remove those weird characters and replace them by normal C-style equivalents for which the proper defines were already in the header. Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * | Remove obsolete command (apply afte USB style patch, 80 chars strict)Michael Trimarchi2008-11-281-9/+0
| | | | | | | | | | | | | | | | | | | | | Remove USB obsolete commmand Signed-off-by: Michael Trimarchi <trimarchi@gandalf.sssup.it> Signed-off-by: Remy Böhmer <linux@bohmer.net>
| * | USB style patch, 80 chars strictMichael Trimarchi2008-11-283-392/+465
| | | | | | | | | | | | | | | | | | | | | USB Code style patch Signed-off-by: Michael Trimarchi <trimarchi@gandalf.sssup.it> Signed-off-by: Remy Böhmer <linux@bohmer.net>
OpenPOWER on IntegriCloud