summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* mpc8641: Remove extra "0" from BR2 defineBecky Bruce2008-11-10-1/+1
| | | | Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* Merge commit 'wd/master'Jon Loeliger2008-11-10-8536/+7619
|\
| * Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-11-09-37/+47
| |\
| | * Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2008-11-09-37/+47
| | |\
| | | * Change to use "do_div" macroTomohiro Masubuchi2008-11-04-13/+45
| | | | | | | | | | | | | | | | Signed-off-by: Tomohiro Masubuchi <tomohiro_masubuchi@tripeaks.co.jp>
| | | * ARM926EJ-S: relocate OMAP specific 'cpuinfo.c' into OMAP directoryRoman Mashak2008-11-04-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP identification is implemented in 'cpuinfo.c' and located in ARM926EJ-S directory. It makes sense to place this file in OMAP specific subdirectory, i.e. cpu/arm926ejs/omap Signed-off-by: Roman Mashak <romez777@gmail.com>
| | | * ARM/Versatile port: Removed unused functionsRoman Mashak2008-11-04-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | Removal of never used functions. Signed-off-by: Roman Mashak <romez777@gmail.com>
| * | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-11-09-30/+619
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://git.denx.de/u-boot-at91Wolfgang Denk2008-11-09-30/+619
| | |\ \
| | | * | AT91: Replace AT91_BASE_EMAC by the board specific values.Stelian Pop2008-11-07-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91_BASE_EMAC is never used outside the board specific files, so replace its usage by the board specific AT91xxx_BASE_EMAC. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | | * | AT91: Replace (undefined) AT91_ID_US* by the board specific values.Stelian Pop2008-11-07-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91_ID_US0 / AT91_ID_US1 / AT91_ID_US2 were used but never defined. Since they are never used outside the board specific files, they can be replaced by the board specific AT91xxx_ID_US0 / AT91xxx_ID_US1 / AT91xxx_ID_US2. Bug spotted by Jesus Alvarez <jalvarez@micromint.com>. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | | * | Makefile/at91sam9: move some at91sam9 to the correct subsection for arm926ejsJean-Christophe PLAGNIOL-VILLARD2008-11-04-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | | * | Custom AFEB9260 board supportSergey Lapin2008-11-04-0/+592
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides support for AFEB9260 board, a product of OpenSource hardware and software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design. More info: http://groups.google.com/group/arm9fpga-evolution-board (In Russian only, sorry). Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb Signed-off-by: Sergey Lapin <slapin@ossfans.org>
| * | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-11-09-7701/+4335
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://git.denx.de/u-boot-coldfireWolfgang Denk2008-11-09-7701/+4335
| | |\ \
| | | * | ColdFire: Fix M5329EVB and M5373EVB nand issueTsiChung Liew2008-11-03-43/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compilation issue caused by a few mismatches. Provide proper nand chip select enable/disable in nand_hwcontrol() rather than in board_nand_init() just enable once. Remove redundant local nand driver functions - nand_read_byte(), nand_write_byte() and nand_dev_ready() to use common nand driver. Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Fix compilation errorTsiChung Liew2008-11-03-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error was caused by the change for strmhz() in cpu.c. A few of them were one extra close parenthesis. Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Add MCF5301x CPU and M53017EVB supportTsiChung Liew2008-11-03-49/+2003
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Add SBF support for M52277EVBTsiChung Liew2008-11-03-62/+843
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add serial boot support Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Use CFI driver for M5272C3TsiChung Liew2008-11-03-383/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Relocate FEC's GPIO and mii functions protocolsTsiChung Liew2008-11-03-12/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Place FEC pin assignments in cpu_init.c from platform's mii.c Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Remove platforms mii.c fileTsiChung Liew2008-11-03-4343/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use mcfmii.c driver in drivers/net rather than keep creating new mii.c for each future platform. Remove EB+MCF-EV123, cobra5272, idmr, M5235EVB, M5271EVB, M5272C3, M5275EVB, M5282EVB, M5329EVB, M5373EVB, M54451EVB, M54455EVB, M547xEVB, and M548xEVB's mii.c Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Modules header files cleanupTsiChung Liew2008-11-03-2784/+1498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate ATA, ePORT, QSPI, FlexCan, PWM, RNG, MDHA, SKHA, INTC, and FlexBus structures and definitions in immap_5xxx.h to more unify modules header files. Append DSPI support for m547x_8x. SSI cleanup. Remove USB Host structure from immap_539.h. Apply changes to use FlexBus structures in mcf52x2's cpu_init.c and platform configuration files. Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire: Remove linker fileTsiChung Liew2008-11-03-287/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each different build for M54455EVB and M5235EVB will create a u-boot.lds linker file. It is redundant to keep the u-boot.lds Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| * | | ppc: Fix compile warnings when !CONFIG_OF_LIBFDTPeter Tyser2008-11-02-2/+3
| |/ / | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * | common/Makefile: create others group for non core, environment and command filesJean-Christophe PLAGNIOL-VILLARD2008-11-02-2/+5
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | TQM8260: use CFI flash driver instead of custom driver.Wolfgang Denk2008-11-02-498/+8
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Consolidate MAX/MIN definitionsAndy Fleming2008-11-02-22/+3
| | | | | | | | | | | | | | | | | | | | | There were several, now there is one (two if you count the lower-case versions). Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mgsuvd: remove unused defines in config file.Heiko Schocher2008-11-02-3/+0
| | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * | Coding Style cleanup, update CHANGELOGWolfgang Denk2008-11-02-241/+2599
| |/ | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | powerpc: change 86xx SMP boot methodBecky Bruce2008-11-04-73/+298
| | | | | | | | | | | | | | | | | | We put the bootpg for the secondary cpus into memory and use BPTR to get to it. This is a step towards converting to the ePAPR boot methodology. Also, the code is written to deal properly with more than 4GB of RAM. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | 8641HPCN: Config file cleanupBecky Bruce2008-11-03-5/+15
| | | | | | | | | | | | | | | | | | | | There are several items in the config file that were hardcoded but that should really be based on other config options, since the regions are contiguous and depend on being so. This cleans that up a bit. Also, add BR_PHYS_ADDR() macro to convert addresses into the proper format for BR registers. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | 86xx: Make dram_size a phys_size_tBecky Bruce2008-11-03-6/+6
| | | | | | | | | | | | It's currently a long and should be phys_size_t. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | powerpc 86xx: Handle CCSR relocation earlierBecky Bruce2008-11-03-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the CCSR gets relocated while translation is enabled, meaning we need 2 BAT translations to get to both the old location and the new location. Also, the DEFAULT CCSR location has a dependency on the BAT that maps the FLASH region. Moving the relocation removes this unnecessary dependency. This makes it easier and more intutive to modify the board's memory map. Swap BATs 3 and 4 on 8610 so that all 86xx boards use the same BAT for CCSR space. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | mpc8641: Make PCI and RIO mutually exclusive, fix non-PCI buildBecky Bruce2008-11-03-17/+38
| | | | | | | | | | | | | | | | | | | | You can't actually have both, and with some coming changes to change the memory map for the board and support 36-bit physical, we need the extra BAT that is being consumed by having both. I also make non-PCI configs build cleanly, for the sake of sanity. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* | mpc8641: Stop supporting non-PCI_PNP configsBecky Bruce2008-11-03-27/+1
|/ | | | | | | We don't actually ever do this, remove the code so we can stop maintaining it. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2008-11-01-79/+67
|\
| * NAND: Allow NAND and OneNAND to coexistAlessandro Rubini2008-10-31-69/+1
| | | | | | | | | | | | | | | | | | | | This removes in nand.h code that is verbatim duplicated from bbm.h, including directly bbm.h in nand.h. The previous state of affairs prevented compiling code for a board hosting both NAND and OneNAND chips. Reported-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.Scott Wood2008-10-31-7/+5
| | | | | | | | | | Reported-by: Alessandro Rubini <rubini-list@gnudd.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * NAND: Add NAND support for MPC8536DS boardJason Jin2008-10-31-2/+60
| | | | | | | | | | | | | | | | | | | | This patch defines 1M TLB&LAW size for NAND on MPC8536DS, assigns 0xffa00000 for CONFIG_SYS_NAND_BASE and adds other NAND supports in config file. It also moves environment(CONFIG_ENV_ADDR) outside of u-boot image. Singed-off-by: Jason Jin <Jason.Jin@freescale.com> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * NAND: Fix CONFIG_ENV_ADDR for MPC8572DSHaiying Wang2008-10-31-1/+1
| | | | | | | | | | | | | | CONFIG_ENV_ADDR should be (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE). Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2008-11-01-7/+7
|\ \
| * | sh: rsk7203: Moved rsk7203 board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: MigoR: Moved MigoR board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: r2dplus: Moved r2dplus board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: sh7763rdp: Moved sh7763rdp board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: sh7785lcr: Moved sh7785lcr board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: r7780mp: Moved r7780mp board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: ap325rxa: Moved ap325rxa board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| |/ | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2008-11-01-1/+2
|\ \