summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ppc4xx: Remove autoupdate feature from PLU405 boardMatthias Fuchs2009-11-253-19/+0
| | | | | | | | The autoupdate feature is not used on PLU405 boards. So remove it. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into nextWolfgang Denk2009-11-245-161/+118
|\
| * ppc4xx: Cleanup PPC4xx I2C infrastructureStefan Roese2009-11-234-157/+118
| | | | | | | | | | | | | | | | | | | | | | This patch cleans up the PPC4xx I2C intrastructure: - Use C struct to describe the I2C registers instead of defines - Coding style cleanup (braces, whitespace, comments, line length) - Extract common code from i2c_read() and i2c_write() - Remove unneeded IIC defines from ppc405.h & ppc440.h Signed-off-by: Stefan Roese <sr@denx.de>
| * ppc4xx: Remove some testing code from 4xx_pcie.cStefan Roese2009-11-231-4/+0
| | | | | | | | | | | | This code got included accidentally. Signed-off-by: Stefan Roese <sr@denx.de>
* | at91: Extended soft_i2c driver for AT91SAM9263 SoCDaniel Gorsulowski2009-11-231-0/+5
|/ | | | | | | | While hard_i2c support is not available (see http://lists.denx.de/pipermail/u-boot/2009-March/049751.html), this patch enables soft_i2c on AT91SAM9263 SoC. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
* Add 'true' and 'false' commandsPeter Tyser2009-11-231-0/+22
| | | | | | | | | | | | | | These commands are only enabled when the hush shell is enabled and can be useful in scripts such as: while true do echo "Booting OS..."; run $bootcmd; echo "Booting OS failed"; sleep 10; done Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* cmd_help: General cleanupPeter Tyser2009-11-231-14/+7
| | | | | | | Shorten the overly-verbose help message of 'help' and clean up some redundant ifdefery while we're at it. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* command.c: Break commands out to appropriate cmd_*.c filesPeter Tyser2009-11-237-233/+353
| | | | | | | command.c should contain common code related to commands, not miscellaneous command implementations. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Merge branch 'next' of git://git.denx.de/u-boot-nand-flash into nextWolfgang Denk2009-11-214-13/+45
|\
| * NAND: Add Support for 4K page size in DaVinci NAND driverSandeep Paulraj2009-11-201-7/+16
| | | | | | | | | | | | | | | | This patch adds support for NAND devices with a page size of 4K in the DaVinci NAND driver. The layout matches the layout that TI uses for 4K page size NAND devices in the kernel NAND driver. Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * S3C2410 NAND Flash Add Missing FunctionHui.Tang2009-11-181-4/+27
| | | | | | | | | | | | | | | | This patch add nand_read_buf() for S3C2410 NAND SPL. In nand_spl/nand_boot.c, nand_boot() will check nand->select_chip, so nand->select_chip should also be initialized. Signed-off-by: Hui.Tang <zetalabs@gmail.com>
| * NAND: Update read_read_subpage API checkSandeep Paulraj2009-11-181-1/+1
| | | | | | | | | | | | | | This patch updates a check condition in the NAND driver. The check condition is similat to what is in linux/next. Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| * NAND:Extending the nand_ecclayout structureSandeep Paulraj2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | NANDs with page size of lesser than and equal to 2K are reaching EOL. They are bing replaced with NANDs of page size 4K and above. To support this we have to extend the eccpos field Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* | Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into nextWolfgang Denk2009-11-2135-2041/+272
|\ \
| * | ppc4xx: Remove unused features from PMC440 board supportMatthias Fuchs2009-11-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This patch shrinks the PMC440 u-boot binary (from next branch) to fit into 384kB again. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Remove confusing commentMatthias Fuchs2009-11-191-4/+0
| | | | | | | | | | | | | | | | | | | | | This is not the sequoia board. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: alpr: Remove some not needed commands to make image fit againStefan Roese2009-11-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest changes in the u-boot/next branch increased the size of the alpr image a bit more. Now it doesn't fit into the 256k reserved for it. This patch now removes the commands "askenv" and "irq" which are not needed in the production systems. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
| * | ppc4xx: Consolidate pci_master_init() functionStefan Roese2009-11-1912-182/+32
| | | | | | | | | | | | | | | | | | | | | | | | This patch removes the duplicted implementations of the pci_master_init() function by introducing a weak default function for it. It can be overridden by a board specific version. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Consolidate pci_pre_init() functionStefan Roese2009-11-1928-837/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the duplicted implementations of the pci_pre_init() function by introducing a weak default function for it. This weak default has a different implementation for some PPC variants. It can be overridden by a board specific version. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Consolidate pci_target_init() functionStefan Roese2009-11-1927-1022/+118
| |/ | | | | | | | | | | | | | | | | | | This patch removes the duplicted implementations of the pci_target_init() function by introducing a weak default function for it. This weak default has a different implementation for 440EP(x)/GR(x) PPC's. It can be overridden by a board specific version (e.g. PMC440, korat). Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
* | OMAP2/3: I2C: Add support for second and third busDirk Behme2009-11-163-98/+170
|/ | | | | | | | | | Add support to use second and third I2C bus, too. Bus 0 is still the default, but by calling i2c_set_bus_num(1/2) before doing I2C accesses, code can switch to bus 1 and 2, too. Don't forget to switch back afterwards, then. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
* Merge branch 'master' into nextWolfgang Denk2009-11-1535-233/+358
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-11-152-62/+64
| |\
| | * smc911x: make smc911x_initialize return correct valueMike Rapoport2009-11-121-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-121-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-152-6/+5
| |\ \
| | * | ppc/85xx: Fix how we determine the number of CAM entriesKumar Gala2009-11-131-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-121-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-151-9/+9
| |\ \ | | |/ | |/|
| | * ARM Don't inline weak symbolsRon Lee2009-11-111-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-118-36/+44
| |\ \
| | * | mxc_fec: avoid free() calls to already freed pointers.javier Martin2009-11-111-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-111-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-093-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-091-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-091-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-091-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-091-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-291-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-112-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | ppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)Stefan Roese2009-11-091-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-091-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-093-1/+142
| |\ \ \
| | * | | ARM: Use Linux version for unaligned access codeRemy Bohmer2009-11-073-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-041-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>
| * | | 86xx: Remove redundant code in initdramBecky Bruce2009-11-043-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same code exists both inside an #ifdef and outside of it. Remove the extra code for all the 86xx boards. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | fsl_pci_init_port end-point initialization is brokenEd Swarthout2009-11-042-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 70ed869e broke fsl pcie end-point initialization. Returning 0 is not correct. The function must return the first free bus number for the next controller. fsl_pci_init() must still be called and a bus allocated even if the controller is an end-point. Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com> Acked-by: Vivek Mahajan <vivek.mahajan@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | Revert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"Kumar Gala2009-11-046-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70ed869ea5f6b1d13d7b140c83ec0dcd8a127ddc. There isn't any need to modify the API for fsl_pci_init_port to pass the status of host/agent(end-point) status. We can determine that internally to fsl_pci_init_port. Revert the patch that makes the API change. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | ppc/85xx: Fix misc L2 cache enabling bugDave Liu2009-10-311-4/+8
| |/ / | | | | | | | | | | | | | | | | | | We need loop-check the flash clear lock and enable bit for L2 cache. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-10-315-69/+54
| |\ \
OpenPOWER on IntegriCloud