summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-niosWolfgang Denk2009-12-01-198/+7
|\
| * Nios2: do_boom_linux(): kernel gunzip input data integrity problem due toRenato Andreola2009-11-23-0/+5
| | | | | | | | | | | | | | | | missing cache flush. Added instruction and data caches flush. Signed-off-by: Scott McNutt <smcnutt@psyent.com>
| * Nios2: Fix compiler warnings in lib_nios2/board.c (unused variables)Scott McNutt2009-11-23-2/+0
| | | | | | | | Signed-off-by: Scott McNutt <smcnutt@psyent.com>
| * Nios2/Nios: Remove unnecessary (residual) linker Nios command scripts fromScott McNutt2009-11-23-196/+2
| | | | | | | | | | | | the standalone examples. Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* | Fix example FIT image source filesIra W. Snyder2009-11-24-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example FIT image source files do not compile with the latest dtc and mkimage. The following error message is produced: DTC: dts->dtb on file "kernel.its" Error: kernel.its 7:0 - 1:0 syntax error FATAL ERROR: Unable to parse input tree ./mkimage: Can't read kernel.itb.tmp: Invalid argument The FIT image source files are missing the "/dts-v1/;" directive at the beginning of the file. Add the directive to the examples. Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
* | img2srec: use standard typesMike Frysinger2009-11-24-102/+62
| | | | | | | | | | | | | | The img2srec code creates a lot of typedefs with common names. These easily clash with system headers that include these typedefs (like mingw). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | tools: gitignore *.exe binariesMike Frysinger2009-11-24-0/+1
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | ppc: Move conditional compilation of kgdb.c to MakefilePeter Tyser2009-11-24-6/+1
| | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | spi_flash.h: pull in linux/types.h for u## typesMike Frysinger2009-11-24-0/+1
| |
* | bootm: mark local boot_os[] table staticMike Frysinger2009-11-24-1/+1
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | mkconfig: deny messed up ARCH definitionNishanth Menon2009-11-24-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refuse to setup a platform if the command line ARCH= is not the same as the one required for the board. This prevents any user with prehistoric aliases from messing up their builds. Reported in thread: http://old.nabble.com/-U-Boot--Build-breaks-on-some-OMAP3-configs-to26132721.html Inputs from: Mike Frysinger and Wolfgang Denk: http://lists.denx.de/pipermail/u-boot/2009-November/063642.html Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Anand Gadiyar <gadiyar@ti.com> Cc: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Nishanth Menon <nm@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-11-24-8/+24
|\ \
| * | Repair the 'netretry=once' option.Remy Bohmer2009-11-24-8/+24
| |/ | | | | | | | | | | | | | | 'netretry = once' does the same as 'netretry = yes', because it is not stored when it was tried once. Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | Merge branch 'master-sync' of git://git.denx.de/u-boot-armWolfgang Denk2009-11-24-1/+2
|\ \
| * | OMAP3: pandora: fix booting without serial attachedGrazvydas Ignotas2009-11-24-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the board is booted without serial cable attached (which is how most of them will be used) UART RX is left floating and sometimes picks noise, which interrupts countdown and enters U-Boot prompt instead of booting the kernel. Fix this by setting up internal pullup on UART RX pin. This does not prevent serial from working as the internal pullup is weak. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
* | | Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=yRemy Bohmer2009-11-24-3/+1
| | | | | | | | | | | | Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | Add support for CS2 dataflash for Atmel-SPI.Remy Bohmer2009-11-23-2/+16
| | | | | | | | | | | | | | | | | | | | | The only missing chipselect line support is CS2, and I need it on CS2... Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | Fix mingw tools buildRemy Bohmer2009-11-23-0/+159
| | | | | | | | | | | | | | | | | | mkimage does not build due to missing strtok_r() and getline() implementation Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | Building of FIT images does not work.Remy Bohmer2009-11-23-0/+1
| |/ |/| | | | | | | | | | | The type is not set for generation of the FIT images, resulting in no images being created without printing or returning an error Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | sf: fix stmicro offset setup while erasingMike Frysinger2009-11-22-1/+2
| | | | | | | | | | Reported-by: Peter Gombos <gombos@protecta.hu> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | sf: new driver for Winbond W25X16/32/64 devicesJason McMullan2009-11-22-0/+339
| | | | | | | | | | Signed-off-by: Jason McMullan <jason.mcmullan@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | mpc8260: move FDT memory node fixup into common CPU code.Marcel Ziswiler2009-11-22-52/+2
| | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com> Tested-by: Heiko Schocher <hs@denx.de>
* | Add driver for FTRTC010 real time clockPo-Yu Chuang2009-11-22-0/+125
| | | | | | | | | | | | | | Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MIMC200: set default fbmem valueMark Jackson2009-11-22-1/+1
| | | | | | | | | | | | | | This patch adds a default bootargs "fbmem" value to the CONFIG_BOOTARGS string for the MIMC200 board. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
* | ppc4xx: Initialize magnetic coupler on VOM405 boardsMatthias Fuchs2009-11-17-0/+35
| | | | | | | | | | | | | | | | | | This patch fixes an ugly behavior of the IL712 magnetic coupler as used on VOM405. These parts will remember their last state over a power cycle which might cause unwanted behavior. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* | ppc4xx: Initialize magnetic couplers in PLU405Matthias Fuchs2009-11-17-1/+38
| | | | | | | | | | | | | | | | | | This patch fixes an ugly behavior of the IL712 magnetic couplers as used on PLU405. These parts will remember their last state over a power cycle which might cause unwanted behavior. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* | Add minimal SJA1000 header for basic CAN modeMatthias Fuchs2009-11-17-0/+60
|/ | | | | | | This patch is in preparation for the upcoming PLU405 board fix. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-11-15-62/+64
|\
| * smc911x: make smc911x_initialize return correct valueMike Rapoport2009-11-12-2/+2
| | | | | | | | | | | | | | | | | | Make smc911x_initialize return -1 on error and number of interfaces detected otherwise. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * smc911x_eeprom: fix building after smc911x overhaulMike Frysinger2009-11-12-60/+62
| | | | | | | | | | | | | | | | | | | | When the smc911x driver was converted to NET_MULTI, the smc911x eeprom was missed. The config option needed updating as well as overhauling of the rergister read/write functions. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2009-11-15-6/+5
|\ \
| * | ppc/85xx: Fix how we determine the number of CAM entriesKumar Gala2009-11-13-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | We were incorrectly use the max CAM size as the number of entries in the array for setting up the addrmap. We should be using the NENTRY field which is the low 12-bits of TLB1CFG. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl-ddr: Fix the chip-select interleaving issueDave Liu2009-11-12-4/+3
| |/ | | | | | | | | | | | | | | | | | | | | commit 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3 introduced one new bug to chip-select interleaving. Single DDR controller also can do the chip-select interleaving if there is dual-rank or qual-rank DIMMs. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'master-sync' of git://git.denx.de/u-boot-armWolfgang Denk2009-11-15-9/+9
|\ \ | |/ |/|
| * ARM Don't inline weak symbolsRon Lee2009-11-11-9/+9
| | | | | | | | | | | | | | | | ------------------------------------------------------------------------ GCC 4.4 complains about this now. Signed-off-by: Ron Lee <ron@debian.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-11-11-36/+44
|\ \
| * | mxc_fec: avoid free() calls to already freed pointers.javier Martin2009-11-11-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, inside NetLoop, eth_halt() is called before eth_init() has been called. This is harmless except for free() calls to pointers which have not been allocated yet. This patch initializes those pointers to NULL and allocates them only the first time. This way we can get rid of free calls in halt callback. This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | mxc_fec: fix some erroneous PHY accesses.javier Martin2009-11-11-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes erroneous access to the ethernet PHY which broke the driver. 1. Selector field in the auto-negotiation register must be 0x00001 for using 802.3, not 0x00000 which is reseved. 2. Access to the PHY address specified by CONFIG_FEC_MXC_PHYADDR, not 0x0 fixed address. This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains. Now using proper defines for auto-negotiation register. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Fix SMC91111 regression: lpd7a40x build failuresBen Warren2009-11-09-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both lpd7a400 and lpd7a404 failed to compile because they had CONFIG_SMC_USE_IOFUNCS defined: examples/standalone/smc91111_eeprom.c:388: undefined reference to `SMC_outw' Also removed an orphaned paren in lpd7a404.h Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | SMC91111: Clean up SMC_inx macros on xsengine and xaeniaxBen Warren2009-11-09-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following warnings: Configuring for xaeniax board... smc91111_eeprom.c: In function 'print_macaddr': smc91111_eeprom.c:278: warning: suggest parentheses around + or - in operand of & smc91111_eeprom.c:281: warning: suggest parentheses around + or - in operand of & ... Configuring for xsengine board... smc91111_eeprom.c: In function 'print_macaddr': smc91111_eeprom.c:278: warning: suggest parentheses around + or - inside shift smc91111_eeprom.c:281: warning: suggest parentheses around + or - inside shift Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Fix CS8900 regression on impa7 boardBen Warren2009-11-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following error was seen on impa7 board, due to its use of a 32-bit bus on CS8900. cs8900.c:137:37: error: macro "get_reg_init_bus" passed 2 arguments, but takes just 1 This patch gives the macro the correct number of arguments Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | clarify eth driver halt/recv stepsMike Frysinger2009-11-09-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | The dev->halt() func can be called at any time, and the dev->recv() func does not need to use NetRxPackets[] when calling NetReceive(). Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Fix cs8900 dev->priv not init issueHui.Tang2009-11-09-3/+4
| | | | | | | | | | | | | | | | | | | | | Ensure all CS8900 data structures are assigned before accessing device Signed-off-by: Hui.Tang <zetalabs@gmail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Fix DM9000 MAC address handlingBen Warren2009-10-29-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Proper behavior is to pull MAC address from NVRAM in the initialization() an stuff it in dev->address, then program the device from dev->address in the init() function. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2009-11-11-2/+2
|\ \ \ | |_|/ |/| |
| * | ppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)Stefan Roese2009-11-09-1/+1
| | | | | | | | | | | | | | | | | | | | | This error only appears when DEBUG is enabled in this driver. That's why it went unnoticed till now. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)Stefan Roese2009-11-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem only seen very occasionally on Canyonlands. The NOR flash interface (CFI driver) doesn't work reliably in all cases. Erasing and/or programming sometimes doesn't work. Sometimes with an error message, like "flash not erased" when trying to program an area that should have just been erased. And sometimes without any error messages. As mentioned above, this problem was only seen rarely and with some PLL configuration (CPU speed, EBC speed). Now I spotted this problem a few times, when running my Canyonlands with the following setup (chip_config): 1000-nor - NOR CPU:1000 PLB: 200 OPB: 100 EBC: 100 Changing the EBC configuration to not release the bus into high impedance state inbetween the transfers (ATC, DTC and CTC bits set to 1 in EBC0_CFG) seems to fix this problem. I haven't seen any failure anymore with this patch applied. Signed-off-by: Stefan Roese <sr@denx.de> Cc: David Mitchell <dmitchell@amcc.com> Cc: Jeff Mann <MannJ@embeddedplanet.com>
* | | Merge branch 'master-sync' of git://git.denx.de/u-boot-armWolfgang Denk2009-11-09-1/+142
|\ \ \
| * | | ARM: Use Linux version for unaligned access codeRemy Bohmer2009-11-07-1/+142
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The asm-arm/unaligned.h includes linux/unaligned/access_ok.h This file is unsafe to be used on ARM, since it does an unaligned memory accesses which fails on ARM. Lookin at Linux the basic difference seems to be the header "include/asm-arm/unaligned.h". The Linux version of "unaligned.h" does *not* include "access_ok.h" at all. It includes "le_byteshift.h" and "be_byteshift.h" instead. Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Stefan Roese <sr@denx.de> -- include/asm-arm/unaligned.h | 3 - include/linux/unaligned/be_byteshift.h | 70 +++++++++++++++++++++++++++++++++ include/linux/unaligned/le_byteshift.h | 70 +++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 include/linux/unaligned/be_byteshift.h create mode 100644 include/linux/unaligned/le_byteshift.h
* | | ppc/85xx: Fix inclusion of 83xx immap in 85xx buildsKumar Gala2009-11-04-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should not be including the immap_83xx.h when building 85xx. We can just get this all from common.h Signed-off-by: Kumar Gala <galak@kernel.crashing.org>