summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* arm: Make jadecpu board use relocationMatthias Weisser2010-09-21-3/+13
| | | | | | | This patch modifies jadecpu board so that it is usable with the relocation patches by Heiko Schocher Signed-off-by: Matthias Weisser <weisserm@arcor.de>
* Merge branch 'next' of ../custodians into nextWolfgang Denk2010-09-21-2/+4451
|\
| * Merge branch 'next' of git://git.denx.de/u-boot-usb into nextWolfgang Denk2010-09-21-2/+4451
| |\
| | * USB-CDC: Fix coding style issuesVitaly Kuzmichev2010-09-20-407/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes most of checkpatch warnings and errors in USB gadget stack. The most frequently encountered problems are: 1) "(foo*)", "foo * bar", "foo* bar" 2) C99 // comments 3) No spaces before/after/around '?', ':', '=', '==', ',', '&', '(' 4) Spaces before '[' 5) Spaces between function names and '(' 6) Block braces in wrong places 7) Spaces before tabs 8) Macros with complex values not enclosed in parenthesis 9) Multiline comments start just after /* Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: called handle_interrupts inside usb_eth_sendStefano Babic2010-09-20-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | The patch removes an endless loop in the usb_eth_send if the tx_complete is not called before going in the loop. The driver interrupt routine is called allowing the driver to check if the TX is completed. Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * USB-CDC: correct wrong alignment in ether.cStefano Babic2010-09-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The buffer for the status request must be word aligned because it is accessed with 32 bit pointer in the eth_status_complete function. Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * USB-CDC: change simple_strtol to simple_strtoulVitaly Kuzmichev2010-09-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch is based on commit bb9496c6f7e853e5d4edd5397c9d45f1968d623c (done by Julia Lawall <julia@diku.dk>) from linux-2.6.git. Since num is unsigned, it would seem better to use simple_strtoul that simple_strtol. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: ethernet error path potential oops fixVitaly Kuzmichev2010-09-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential oops on rare error path. The patch is based on commit e7b13ec9235b9fded90f826ceeb8c34548631351 (done by David Brownell <david-b@pacbell.net>) from linux-2.6.git. Description of the issue taken from linux kernel bugzilla: (https://bugzilla.kernel.org/show_bug.cgi?id=9594) The potential error can be tracked down as follows: (1) line 807: let the second conjunct on the "if" statment be false meaning "dev->status_ep" is null. This means the "if" evaluates to false. follow thru the code until... (2) line 808: usb_ep_disable(dev->status_ep) passes in a null argument, however "usb_ep_disable" cannot handle that: (from include/linux/usb/gadget.h) 191 static inline int 192 usb_ep_disable (struct usb_ep *ep) 193 { 194 return ep->ops->disable (ep); 195 } -- Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: Correct stat_req initializationVitaly Kuzmichev2010-09-20-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix possible oops on stat_req->buf initialization and fix ep0 and status_ep confusion (last one is just intended for stat_req keeping). Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> Signed-off-by: Stefano Babic <sbabic@denx.de>
| | * USB-CDC: Replace 'strcpy' by 'strlcpy'Vitaly Kuzmichev2010-09-20-3/+3
| | | | | | | | | | | | | | | | | | Replace 'strcpy' by more safe 'strlcpy' that is implemented in ether.c Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: Correct freeing usb requestsVitaly Kuzmichev2010-09-20-2/+7
| | | | | | | | | | | | | | | | | | | | | Fix in_ep and out_ep confusion (rx_req was allocated from out_ep, not from in_ep) and add lost dev->req freeing. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: Use native debug printout macrosVitaly Kuzmichev2010-09-20-53/+43
| | | | | | | | | | | | | | | | | | | | | | | | Replace Linux-like debug printout macros by native ones. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> Applied after removing dead code like '#define DEBUG/#undef DEBUG'
| | * USB-CDC: Add lost 'qmult' definitionVitaly Kuzmichev2010-09-20-0/+6
| | | | | | | | | | | | | | | | | | | | | Add lost 'qmult' definition for High Speed devices and make it configurable through CONFIG_USB_ETH_QMULT. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * USB-CDC: Restuct USB gadget MakefileVitaly Kuzmichev2010-09-20-2/+5
| | | | | | | | | | | | | | | | | | | | | Prohibit simultaneous usage of both old and new gadget stacks and allow UDC drivers to be dependent on CONFIG_USB_ETHER. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
| | * Integrate USB gadget layer and USB CDC driver layerRemy Bohmer2010-09-20-2/+4425
| | | | | | | | | | | | | | | | | | | | | Derived from Linux kernel 2.6.27 Signed-off-by: Thomas Smits <ts.smits@gmail.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
| | * usb: musb: stub out MUSB_TXCSR_MODE for Blackfin partsMike Frysinger2010-09-20-0/+2
| | | | | | | | | | | | | | | | | | | | | The MUSB_TXCSR_MODE register setting isn't supported on Blackfin musb parts, so stub it out to 0. This matches Linux behavior. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'next' of ../custodians into nextWolfgang Denk2010-09-21-57/+48
|\ \ \ | |/ /
| * | cfi_flash: Remove uneccessary #ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECTStefan Roese2010-09-20-17/+3
| | | | | | | | | | | | | | | | | | | | | Now that the defines are moved to header files we don't need this conditional compilation any more. Remove it. Signed-off-by: Stefan Roese <sr@denx.de>
| * | cfi_flash: Simplify dynamic flash bank number detectionStefan Roese2010-09-20-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies the use of CONFIG_SYS_MAX_FLASH_BANKS_DETECT. By moving these optional variables and defines into the common code, board specific code is minimized. Currently only the following board use this feature: APC405, IDS8247, TQM834x And IDS8247 doesn't seem to really need this feature, since its not updating the bank number variable at all. So this patch removes the definition of CONFIG_SYS_MAX_FLASH_BANKS_DETECT from this board port. This new framework will be used by the upcoming lwmon5 update as well. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Heiko Schocher <hs@denx.de> Cc: Matthias Fuchs <matthias.fuchs@esd.eu>
| * | cfi_flash: Add weak default for cfi_flash_bank_addr()Stefan Roese2010-09-20-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfi_flash_bank_addr(int bank_nr) returns the base addresses of the requested bank. Introducing this weak default enables boards to override this functions with a board specific version when required. This feature will be used in the lwmon5 board update, supporting runtime detection of 2 board revisions with different flash layouts. Signed-off-by: Stefan Roese <sr@denx.de>
| * | cfi_flash: Simplify flash_get_info()Stefan Roese2010-09-20-2/+2
| |/ | | | | | | | | | | | | | | | | | | This patch removes an unecessary check in the return statement. This is not needed, since "info" is initializes to NULL. And "info" will not be written to again, if the flash address is not found. Additionally "info" is not initialized to "0" but to "NULL". Signed-off-by: Stefan Roese <sr@denx.de>
* | Remove spieval board supportWolfgang Denk2010-09-19-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes caused that the spieval board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time: mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. The board is orphaned. Drop support for it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Remove smmaco4 board supportWolfgang Denk2010-09-19-380/+0
| | | | | | | | | | | | | | | | | | | | | | | | Recent changes caused that the smmaco4 board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time: mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. The board is orphaned. Drop support for it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Remove HMI10 board supportWolfgang Denk2010-09-19-717/+23
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes caused that the HMI10 board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time: ps2ser.c: In function 'ps2ser_init': ps2ser.c:155: error: 'UART_LCR' undeclared (first use in this function) ps2ser.c:155: error: (Each undeclared identifier is reported only once ps2ser.c:155: error: for each function it appears in.) ps2ser.c:156: error: 'UART_DLL' undeclared (first use in this function) ps2ser.c:157: error: 'UART_DLM' undeclared (first use in this function) ps2ser.c:159: error: 'UART_IER' undeclared (first use in this function) ps2ser.c:160: error: 'UART_MCR' undeclared (first use in this function) ps2ser.c:161: error: 'UART_FCR' undeclared (first use in this function) ps2ser.c:162: error: 'UART_FCR_ENABLE_FIFO' undeclared (first use in this function) ps2ser.c:166: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_putc': ps2ser.c:198: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c:200: error: 'UART_TX' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_getc_hw': ps2ser.c:224: error: 'UART_LSR' undeclared (first use in this function) ps2ser.c:225: error: 'UART_RX' undeclared (first use in this function) ps2ser.c: In function 'ps2ser_interrupt': ps2ser.c:293: error: 'UART_IIR' undeclared (first use in this function) The board is orphaned, and AFAICT has reached EOL. Drop support for it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* canmb board: Fix compiler warningsWolfgang Denk2010-09-19-4/+4
| | | | | | | | | | | | | | | | Recent changes caused thatthe aev board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time: canmb.c: In function 'initdram': canmb.c:109: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness canmb.c:111: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness canmb.c:137: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness canmb.c:140: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness Fix these. Signed-off-by: Wolfgang Denk <wd@denx.de>
* aev board: Fix compile problemsWolfgang Denk2010-09-19-2/+3
| | | | | | | | | | | | | Recent changes caused thatthe aev board now is included in the boards built by MAKEALL, which revealed that compilation for this board has been broken for a long time: mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. mpc5xxx_fec.c:899:2: error: #error fec->xcv_type not initialized. Fix it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* da8xx: fixup ARM relocation supportBen Gardiner2010-09-19-0/+18
| | | | | | | | | | | | | | | | | | | | | Split the existing dram_init for da8xx when ARM reloc is enabled, like the changes to arch/arm/cpu/arm926ejs/orion5x/dram.c in 0f234d263b17ccf1b8fd776eb8c15b7cdb27a887 by Heiko Schocher <hs@denx.de>. Without these changes gd->ram_size is '0' which leads to incorrect relocation when CONFIG_SYS_ARM_WITHOUT_RELOC is defined and the board does not boot. We use get_ram_size to dynamically calculate the available RAM because it runs on different board version with different ram, as suggested by Heiko in private communication. Tested on a da850evm with 128M of DDR2 installed; with both CONFIG_SYS_ARM_WITHOUT_RELOC defined and undefined. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Reviewed-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com> CC: Sudhakar Rajashekhara <sudhakar.raj@ti.com> CC: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for arm1176Heiko Schocher2010-09-19-1/+299
| | | | | | | | | | Change the implementation for arm1176 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for arm720tHeiko Schocher2010-09-19-1/+183
| | | | | | | | | | Change the implementation for arm720t to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for arm_intcmHeiko Schocher2010-09-19-1/+179
| | | | | | | | | | Change the implementation for arm_intcm to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for lh7a40xHeiko Schocher2010-09-19-2/+199
| | | | | | | | | | Change the implementation for lh7a40x to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for s3c44b0Heiko Schocher2010-09-19-1/+187
| | | | | | | | | | Change the implementation for s3c44b0 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for sa1100Heiko Schocher2010-09-19-1/+175
| | | | | | | | | | Change the implementation for sa1100 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ixpHeiko Schocher2010-09-19-1/+293
| | | | | | | | | | Change the implementation for ixp to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for pxaHeiko Schocher2010-09-19-1/+181
| | | | | | | | | | Change the implementation for pxa to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ARM946Heiko Schocher2010-09-19-2/+180
| | | | | | | | | | Change the implementation for arm946 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ARM925Heiko Schocher2010-09-19-2/+216
| | | | | | | | | | Change the implementation for arm925 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ARM920Heiko Schocher2010-09-19-2/+237
| | | | | | | | | | Change the implementation for arm920 to relocate the code to an arbitrary address in RAM. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ARM926Heiko Schocher2010-09-19-21/+310
| | | | | | | | | | | | | | | | | | | | | Change the implementation for arm926 to relocate the code to an arbitrary address in RAM. Adapt the TX25 (i.MX25), magnesium board to test the changes. On the tx25 board TEXT_BASE is set to the final relocation address to prevent one more copying of u-boot code when relocating. More info see: doc/README.arm-relocation da850 board: Tested-by: Ben Gardiner <bengardiner@nanometrics.ca> Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Ben Gardiner <bengardiner@nanometrics.ca>
* ARM: implement relocation for ARM V7 (OMAP)Heiko Schocher2010-09-19-7/+291
| | | | | | | | | | | | Change the implementation for ARM V7 to relocate the code to an arbitrary address in RAM. Adapt the Beagle board (Cortex A8) to test the changes. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: implement relocation for ARM11Heiko Schocher2010-09-19-43/+273
| | | | | | | | | | | | Change the implementation for ARM11 to relocate the code to an arbitrary address in RAM. Tested on the qong board. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM: add relocation supportHeiko Schocher2010-09-19-8/+910
| | | | | | | | | | | | | | | | | | | !! This breaks support for all arm boards !! To compile in old style, you must define CONFIG_SYS_ARM_WITHOUT_RELOC or you can compile with "CONFIG_SYS_ARM_WITHOUT_RELOC=1 ./MAKEALL board" !! This define will be removed soon, so convert your board to use relocation support Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de> Fix boot from NAND for non-ARM systems Signed-off-by: Wolfgang Denk <wd@denx.de>
* nand_boot_fsl_nfc.c: make "nfc" a "static const" pointerHeiko Schocher2010-09-19-5/+1
| | | | | | | | | | | | | With -fPIC enabled, this variable needs an entry in the GOT, which causes the image size to exceed 2 KiB which is the maximum allowed for some systems. Making it a "static const" avoids the GOT entry and thus reduces the image size to < 2 KiB. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Scott Wood <scottwood@freescale.com>
* i2c, omap24xx: set bus_initialized only after relocation.Heiko Schocher2010-09-19-1/+3
| | | | | | | Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* disk/part.c: fix relocation fixupHeiko Schocher2010-09-19-2/+9
| | | | | | | Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* i2c: fix command usage helpHeiko Schocher2010-09-19-0/+3
| | | | | | | Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* common: move TOTAL_MALLOC_LEN to include/common.hHeiko Schocher2010-09-19-26/+9
| | | | | | | Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* relocation: fixup cmdtableHeiko Schocher2010-09-19-92/+56
| | | | | | | | | | | | | fixup_cmdtable() did all work for fixing up the cmdtable, if CONFIG_RELOC_FIXUP_WORKS is not defined. CONFIG_RELOC_FIXUP_WORKS is missing for i386! I talked with Graeme Russ, and he will fix this soon. Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM (ARM11): add data cache support, test on Qong boardHeiko Schocher2010-09-19-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Add data cache support for arm1136 systems. Enable "cache" command on Qong board and test performance. Test 1: Loading 127 MB of data from NAND flash into RAM: Instr. Cache off on on Data Cache off off on -------------------------------------------------- QONG (ARM11) 177s 95s 43s = x 4.1 Test 2: uncompressing a gzipped image from RAM to RAM (size compressed: 6.5 MiB, uncompressed: 35 MiB): Instr. Cache off on on Data Cache off off on -------------------------------------------------- QONG (ARM11) 1.54s 0.95s 0.18s = x 8.6 Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de>
* ARM V7 (OMAP): add data cache support, test on Beagle boardHeiko Schocher2010-09-19-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add data cache support for ARM V7 systems. Used cache flush functions from linux:arch/arm/mm/cache-v7.S developed from Catalin Marinas. Enable "cache" command on Beagle board and test performance. Test 1: Loading 127 MB of data from NAND flash into RAM: Instr. Cache off on on Data Cache off off on -------------------------------------------------- Beagle (Cortex A8) 116s 106s 30.3s = x 3.8 Test 2: uncompressing a gzipped image from RAM to RAM (size compressed: 6.5 MiB, uncompressed: 35 MiB): Instr. Cache off on on Data Cache off off on -------------------------------------------------- Beagle (Cortex A8) 1.84s 1.64s 0.12s = x 15.3 Portions of this work were supported by funding from the CE Linux Forum. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Ben Gardiner<bengardiner@nanometrics.ca>