summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'cleanups' into nextHaavard Skinnemoen2009-02-23-635/+1258
|\
| * Merge branch 'fixes' into cleanupsHaavard Skinnemoen2008-12-17-77714/+116712
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: board/atmel/atngw100/atngw100.c board/atmel/atstk1000/atstk1000.c cpu/at32ap/at32ap700x/gpio.c include/asm-avr32/arch-at32ap700x/clk.h include/configs/atngw100.h include/configs/atstk1002.h include/configs/atstk1003.h include/configs/atstk1004.h include/configs/atstk1006.h include/configs/favr-32-ezkit.h include/configs/hammerhead.h include/configs/mimc200.h
| * | avr32: Add support for "GPIO" port muxHaavard Skinnemoen2008-09-01-0/+301
| | | | | | | | | | | | | | | | | | | | | | | | The "GPIO" port mux is used on AVR32 UC3 parts as well as AT32AP7200 and all later AVR32 chips. This patch adds a driver for it, implementing the same API as the existing portmux-pio driver but with more functionality. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | atstk1000: Convert to new-style makefileHaavard Skinnemoen2008-09-01-4/+5
| | | | | | | | | | | | Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | avr32: use board_early_init_r instead of board_init_infoHaavard Skinnemoen2008-09-01-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the avr32-specific board_init_info hook by the standard board_early_init_r hook and make it optional. board_early_init_r() runs somewhat earlier than board_init_info used to do, but this isn't a problem for any of the in-tree boards. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | avr32: Use board_postclk_init instead of gclk_initHaavard Skinnemoen2008-09-01-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the avr32-specific gclk_init() board hook with the standard board_postclk_init() hook which is supposed to run at the same point during initialization. Provide a dummy weak alias for boards not implementing this hook. The cost of this is: - 2 bytes for the dummy function (retal 0) - 2 bytes for each unnecessary function call (short rcall) which is a pretty small price to pay for avoiding lots of #ifdef clutter. In this particular case, all boards probably end up slightly smaller because we avoid the conditional checking if the gclk_init symbol is NULL. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | hammerhead: Use gclk helper functionsHaavard Skinnemoen2008-09-01-8/+2
| | | | | | | | | | | | | | | | | | | | | Use the new gclk helper functions to set up the PHY clock instead of accessing the PM registers directly. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | avr32: Add gclk helper functionsHaavard Skinnemoen2008-09-01-2/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two helper functions for configuring and enabling generic clocks: - gclk_enable_output: Enables output on a GCLKx pin - gclk_set_rate: Configures a gclk to run at a specific rate This should eliminate any reason to go mucking about with PM registers from board code. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | avr32: refactor the portmux/gpio codeHaavard Skinnemoen2008-09-01-592/+795
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Separate the portmux configuration functionality from the GPIO pin control API. - Separate the controller-specific code from the chip-specific code. - Allow "ganged" port configuration (multiple pins at once). - Add more flexibility to the "canned" peripheral select functions: - Allow using more than 23 address bits, more chip selects, as well as NAND- and CF-specific pins. - Make the MACB SPEED pin optional, and choose between MII/RMII using a parameter instead of an #ifdef. - Make it possible to use other MMC slots than slot 0, and support different MMC/SDCard data bus widths. - Use more reasonable pull-up defaults; floating pins may consume a lot of power. - Get rid of some custom portmux code from the mimc200 board code. The old gpio/portmux API couldn't really handle its requirements, but the new one can. - Add documentation. The end result is slightly smaller code for all boards. Which isn't really the point, but at least it isn't any larger. This has been verified on ATSTK1002 and ATNGW100. I'd appreciate if the board maintainers could help me test this on their boards. In particular, the mimc200 port has lost a lot of code, so I'm hoping Mark can help me out. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Cc: Mark Jackson <mpfj@mimc.co.uk> Cc: Alex Raimondi <alex.raimondi@miromico.ch> Cc: Julien May <julien.may@miromico.ch> Changes since v1: * Enable pullup on NWAIT * Add missing include to portmux-pio.h * Rename CONFIG_PIO2 -> CONFIG_PORTMUX_PIO to match docs
| * | avr32: data_bits should reflect the actual number of data bitsHaavard Skinnemoen2008-09-01-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make the data_bits enum in struct sdram_config reflect the actual number of data bits on the bus, i.e. 16 or 32. Having 0 mean 16 bits and 1 mean 32 bits is just too confusing. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * | avr32: Update READMEHaavard Skinnemoen2008-09-01-16/+8
| | | | | | | | | | | | | | | | | | | | | Remove some outdated and/or unnecessary information, and add updated information about the toolchain and buildroot. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
* | | Update CHANGELOG; Prepare 2009.03-rc1v2009.03-rc1Wolfgang Denk2009-02-23-2/+266
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | ARM: synchronize mach-types.h with linux v2.6.29-rc5-315-g683fdc5Wolfgang Denk2009-02-22-12/+1741
| | | | | | | | | | | | | | | | | | The file was generated from building versatile_defconfig. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-02-22-266/+842
|\ \ \
| * \ \ Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2009-02-22-266/+842
| |\ \ \
| | * | | OMAP3: Clean up MMC codeDirk Behme2009-02-22-90/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up OMAP3 MMC code: * Convert register access to struct & readx/writex style * Replace hardcode values by macros * Remove macro defined twice Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
| | * | | OMAP3: Pandora: Update pin muxDirk Behme2009-02-22-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clock pin must have input enabled for MMC3 to work. Also enable pull-ups for cmd/data lines to be consistent with remaining MMC host pin setup. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
| | * | | OMAP3: Add OMAP3 auto detectionDirk Behme2009-02-22-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds OMAP3 cpu type auto detection based on OMAP3 register and removes hardcoded values. Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
| | * | | OMAP3: Beagle: Add board revision detectionDirk Behme2009-02-22-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With BeagleBoard revision C some HW changes are introduced (e.g. PinMUX) which might need different software handling. For this, GPIO pin 171 (GPIO module 6, offset 11) can be used to check for board revision. If this pin is low, we have a rev C board. Else it must be a revision Ax or Bx board. To handle board differences you can call function beagle_get_revision(). E.g.: if (beagle_get_revision()) { /* do special revision C stuff here */ } Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
| | * | | OMAP3: Overo: Clean up pin mux and GPIO configurationDirk Behme2009-02-22-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make Overo GPIO114 an input for touchscreen PENDOWN * Make Overo GPIO144-147 readable * Make Overo EHCI pinmux match beagle rev c setup * Adjust pinmux for SMSC911X network chip support * Remove unnecessary GPIO setup * Fix merge error in Makefile Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
| | * | | nmdk8815: fix onenand supportJean-Christophe PLAGNIOL-VILLARD2009-02-22-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | nomadik/nand: fix 'ecc512' discards qualifiers from pointer target typeJean-Christophe PLAGNIOL-VILLARD2009-02-22-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | davinci: fix implicit declaration of function 'davinci_errata_workarounds'Jean-Christophe PLAGNIOL-VILLARD2009-02-22-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | arm: add uart dcc supportJean-Christophe PLAGNIOL-VILLARD2009-02-22-0/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serial driver via the EmbeddedICE macrocell's DCC channel using co-processor 14. It does include a timeout to ensure that the system does not totally freeze when there is nothing connected to read. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * | | ARM DaVinci: Add common peripherals and modules enable functions.Hugo Villeneuve2009-02-22-105/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken all the duplicated code for enabling common modules and apply software workarounds from the board specific code into common functions. Also added comments explaining the workarounds (from TI errata documents) and replaced some numerical bit numbers with more meaningful defines. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
| | * | | Enable Ethernet for Nomadik 8815 Evaluation KitAlessandro Rubini2009-02-22-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This trivially enables Ethernet support in the debug board by setting up the proper chip select. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
| | * | | Nand driver for Nomadik SoCAlessandro Rubini2009-02-22-10/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver implements the ECC algorithm described in the CPU data sheet and uses the OOB layout chosen in already-released development systems (shipped with a custom-made u-boot 1.3.1). Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
| | * | | Added nomadik.h headerAlessandro Rubini2009-02-22-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stnwireless.com>
* | | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-02-22-5/+31
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2009-02-22-5/+31
| |\ \ \ \
| | * | | | r8a66597-hcd: fix cannot use external hubYoshihiro Shimoda2009-02-22-5/+31
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the problem that cannot use external hub, because this driver did not control correctly a DEVADDx register. Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
* | | | | MIPS: Fix GCC-4.2 'discards qualifiers from pointer target type' warningsShinya Kuribayashi2009-02-22-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling dbau1x00 and gth2 boards with GCC-4.2, you would see new warnings like this: skuribay@ubuntu:u-boot.git$ ./MAKEALL dbau1000 Configuring for dbau1x00 board... au1x00_eth.c: In function 'au1x00_send': au1x00_eth.c:158: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type au1x00_eth.c: In function 'au1x00_recv': au1x00_eth.c:211: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type au1x00_eth.c: In function 'au1x00_init': au1x00_eth.c:252: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type au1x00_eth.c: In function 'au1x00_recv': au1x00_eth.c:211: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type au1x00_eth.c: In function 'au1x00_init': au1x00_eth.c:252: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type au1x00_eth.c: In function 'au1x00_send': au1x00_eth.c:158: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type We're passing a volatile pointer to a function which is expecting a non- volatile pointer. That's potentially dangerous, so gcc warns about it. Confirmed with ELDK 4.2 (GCC 4.2.2) and Sourcey G++ 4.2 (GCC 4.2.3). To fix this, we add a volatile attribute to the argument in question. The virt_to_phys function in Linux kernel also does the same thing. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-02-22-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Blackfin: disable syscontrol code for nowMike Frysinger2009-02-21-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the initcode updates fell out of order during my merges. The patch that really fixes up this code is part of power-on overhaul and so is too large for merging at this point. Instead, we can disable the code as no currently in-tree board depends on it. The next merge window will fix things up properly. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | Blackfin: bf537-stamp: fix I2C board definesMike Frysinger2009-02-21-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous merge for cleaning up the I2C driver incorrectly reverted the CFG_xxx rename for some of the I2C defines. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Heiko Schocher <hs@denx.de>
* | | | Coding Style cleanup; update CHANGELOGWolfgang Denk2009-02-22-5/+370
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | Makefile: fix cleanupWolfgang Denk2009-02-22-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Commit e4943ec5 moved the ARM boards to a vendor directory but forgot to adapt the cleanup rules in the Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Cleanup the comment for m68k linux boot argument passing.Richard Retanubun2009-02-21-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch clarifies the way m68k passes linux boot argument. The one gotcha here is that the assembly instruction that the compiler uses to jump to the kernel is 'jsr' which pushes the program counter for the instruction after the jsr into the stack pointer. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | sh: Fix rsk7203 in tree buildPeter Griffin2009-02-21-1/+1
| | | | | | | | | | | | Signed-off-by: Peter Griffin <pgriffin@mpc-data.co.uk>
* | | bootm: Reduce the unnecessary memmoveMinkyu Kang2009-02-21-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although load address and image start address are same address, bootm command always does memmove. That is unnecessary memmove and can be taken few milliseconds (about 500 msec to 1000 msec). If skip this memmove, we can reduce the boot time. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | | fpga: Fix Spartan III FPGA bootingMatthias Fuchs2009-02-21-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does some minor fixing of the Xilinx Spartan III FPGA boot code: - Fixed call order of post configuration callback and success message printing (result of copy-paste?) - remove obsolete comment - minor coding style cleanup Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | fpga: Fix Spartan II FPGA bootingMatthias Fuchs2009-02-21-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does some minor fixing of the Xilinx Spartan II FPGA boot code: - Fixed call order of post configuration callback and success message printing (result of copy-paste?) - relocate post configuration callback only when it is implemented - remove obsolete comment - minor coding style cleanup Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | drivers/serial/ns16550: move ifdef into Makefile COBJS-$(...)Mike Frysinger2009-02-21-11/+3
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | lcd_putc bug fix for tab.Derek Ou2009-02-21-1/+1
| | | | | | | | | | | | Signed-off-by: Derek Ou <dou@siconix.com>
* | | MIPS: cpu/mips/Makefile: Add a missing START lineShinya Kuribayashi2009-02-21-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the commit 79b51ff8205f0354d5300570614c1d2db499679c ([MIPS] cpu/mips/ Makefile: Split [CS]OBJS onto separate lines), I wrongly deleted a START line. This patch puts it back. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
* | | Enable ext2 support for TQM8xxL/M based boardsWolfgang Denk2009-02-21-0/+13
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | ARM:PXA Use new definitions in mmc.hTom Rix2009-02-20-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | Reduce the scope of PXA's mmc_read/mmc_write/mmc_bread functionsAndy Fleming2009-02-20-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | These names are being taken over by the new MMC framework. Hopefuly the PXA can be easily ported, and these functions will go away entirely. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | pxa: move mmc drivers to drivers/mmcJean-Christophe PLAGNIOL-VILLARD2009-02-20-16/+38
| | | | | | | | | | | | | | | | | | introduce new macro CONFIG_PXA_MMC to activate it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | ARM:PXA Remove redefinition of mmc_cid and mmc_csd.Tom Rix2009-02-20-51/+0
| | | | | | | | | | | | | | | | | | These structures are defined in the common mmc.h This was compile checked on cerf250.