summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into hpc2roy zang2007-02-28-0/+6
|\ | | | | | | | | | | | | | | Conflicts: drivers/Makefile Fix the merge conflict in file drivers/Makefile Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
| * Merge with /home/stefan/git/u-boot/denx-merge-srStefan Roese2007-02-20-0/+3
| |\
| | * Merge with /home/tur/git/u-boot#motionproWolfgang Denk2007-02-16-0/+3
| | |\
| | | * [Motion-PRO] Preliminary support for the Motion-PRO board.Bartlomiej Sieka2007-02-09-0/+3
| | | |
| * | | [PATCH] Add support for the AMCC Katmai (440SPe) eval boardStefan Roese2007-02-20-0/+3
| |/ / | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' into hpc2roy zang2007-02-12-7/+9
|\ \ \ | |/ /
| * | [PATCH] Change configuration output of Sycamore, Yellowstone & RainierStefan Roese2007-02-02-8/+4
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | [PATCH] Add support for esd mecp5200 boardStefan Roese2007-01-31-0/+3
| | | | | | | | | | | | Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
| * | Merge with /home/sr/git/u-boot/denx-merge-srWolfgang Denk2007-01-30-1/+4
| |\ \
| | * | [PATCH] Merge Yosemite & Yellowstone board portsStefan Roese2007-01-30-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Now the AMCC eval boards Yosemite (440EP) and Yellowstone (440GR) share one config file and all board specific files. This way we don't have to maintain two different sets of files for nearly identical boards. Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' into hpc2roy zang2007-01-30-0/+3
|\ \ \ | |/ /
| * | Add port for the lpc2292sodimm evaluation board from EmbeddedArtistsGary Jennejohn2007-01-24-0/+3
| |/
* | Merge branch 'master' into hpc2roy zang2007-01-22-4/+24
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: drivers/cfi_flash.c The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007 fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support mpc7448hpc2 board.
| * [PATCH] Add support for Prodrive SCPU (PDNB3 variant) boardStefan Roese2007-01-18-2/+9
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * Merge with /home/stefan/git/u-boot/denx-merge-srStefan Roese2007-01-18-2/+2
| |\
| | * Raname solidcard3 into sc3; add redundant env for sc3Wolfgang Denk2007-01-16-2/+2
| | |
| * | [PATCH] Add support for AMCC Taishan PPC440GX eval boardStefan Roese2007-01-18-0/+3
| |/ | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * Merge with /home/hs/SC3/u-bootWolfgang Denk2007-01-15-0/+3
| |\ | | | | | | | | | Some code cleanup.
| | * Added support for the SOLIDCARD III board from EurodesignHeiko Schocher2007-01-11-0/+3
| | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * | Merge with /home/hs/MAN/u-boot-devWolfgang Denk2007-01-15-0/+2
| |\ \
| | * | [PATCH] Add support for the UC101 board from MAN.Heiko Schocher2006-12-21-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * | | CAM5200 flash driver modifications:Marian Balakowicz2007-01-10-0/+5
| | | | | | | | | | | | | | | | | | | | - use CFI driver (replaces custom flash driver) for main 'cam5200' target - add second build target 'cam5200_niosflash' which still uses custom driver
| * | | Prepare for release 1.2.0Wolfgang Denk2007-01-07-2/+2
| | |/ | |/|
* | | Merge branch 'master' into hpc2roy zang2007-01-04-0/+6
|\ \ \ | |/ /
| * | Merge with /home/hs/TQ/u-boot-devWolfgang Denk2006-12-24-0/+3
| |\ \
| | * | Added support for the TQM8272 board from TQHeiko Schocher2006-12-21-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * | | Preliminary support for the iDMR board (ColdFire).Bartlomiej Sieka2006-12-20-0/+3
| | |/ | |/|
* | | Fix the confilcts when merging 'master' into hpc2.roy zang2006-12-01-21/+55
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conflicts due to a new mpc7448 p3m7448 board is in the main tree. Merge branch 'master' into hpc2 Conflicts: MAKEALL cpu/74xx_7xx/cpu.c cpu/74xx_7xx/cpu_init.c cpu/74xx_7xx/speed.c
| * | Code cleanup.Wolfgang Denk2006-11-30-15/+15
| | |
| * | Merge with http://opensource.freescale.com/pub/scm/u-boot-83xx.gitWolfgang Denk2006-11-30-6/+30
| |\ \
| | * \ Merge http://www.denx.de/git/u-bootKim Phillips2006-11-28-0/+3
| | |\ \
| | * | | mpc83xx: add QE ethernet supportDave Liu2006-11-03-0/+3
| | | | | | | | | | | | | | | | | | | | this patch adds support for the QUICC Engine based UCC gigabit ethernet device.
| | * | | mpc83xx: Add MPC8360EMDS basic board supportDave Liu2006-11-03-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Add support for the Freescale MPC8360EMDS board. Includes DDR, DUART, Local Bus, PCI.
| | * | | mpc83xx: Add support for the MPC8349E-mITXTimur Tabi2006-11-03-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PREREQUISITE PATCHES: * This patch can only be applied after the following patches have been applied: 1) DNX#2006090742000024 "Add support for multiple I2C buses" 2) DNX#2006090742000033 "Multi-bus I2C implementation of MPC834x" 3) DNX#2006091242000041 "Additional MPC8349 support for multibus i2c" 4) DNX#2006091242000078 "Add support for variable flash memory sizes on 83xx systems" 5) DNX#2006091242000069 "Add support for Errata DDR6 on MPC 834x systems" CHANGELOG: * Add support for the Freescale MPC8349E-mITX reference design platform. The second TSEC (Vitesse 7385 switch) is not supported at this time. Signed-off-by: Timur Tabi <timur@freescale.com>
| | * | | mpc83xx: Removed unused file resetvec.S for mpc83xx cpuTanya Jiang2006-11-03-3/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | Removed unused file resetvec.S for mpc83xx cpu Signed-off-by: Tanya Jiang <tanya.jiang@freescale.com>
| * | | [PATCH] Add support for Prodrive P3M750 & P3M7448 (P3Mx) boardsStefan Roese2006-11-29-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Prodrive P3M750 (PPC750 & MV64460) and the P3M7448 (MPC7448 & MV64460) PMC modules. Both modules are quite similar and share the same board directory "prodrive/p3mx" and the same config file "p3mx.h". Signed-off-by: Stefan Roese <sr@denx.de>
* | | Clean up the code according to codestyle:roy zang2006-12-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) remove some C++ comments. (2) remove trailing white space. (3) remove trailing empty line. (4) Indentation by table. (5) remove {} in one line condition. (6) add space before '(' in function call. Remove some weird printf () output. Add necessary comments. Modified Makefile to support building in a separate directory.
* | | Solve the copyright conflicts when merging 'master' into hpc2.roy zang2006-11-29-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c
| * | Merge with /home/stefan/git/u-boot/denxStefan Roese2006-11-10-15/+55
| |\ \ | | |/
| * | Merge with /home/stefan/git/u-boot/denxStefan Roese2006-09-18-554/+781
| |\ \
| * | | Add initial support for the ALPR board from ProdriveStefan Roese2006-08-15-0/+3
| | | | | | | | | | | | | | | | | | | | NAND needs some additional testing Patch by Heiko Schocher, 15 Aug 2006
* | | | Merge branch 'master' into hpc2roy zang2006-11-03-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge with /home/tur/proj/uboot_linux_v38b/u-bootWolfgang Denk2006-11-02-1/+1
| |\ \ \
| | * | | Changed MarelV38B board make target to lowercase. Config file cleanup.Bartlomiej Sieka2006-11-01-1/+1
| | | | |
| * | | | Release U-Boot 1.1.6Wolfgang Denk2006-11-02-1/+1
| |/ / /
* | | | General code modification for mpc7448hpc2 board support.roy zang2006-11-02-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add 7447A and 7448 processor support. 2. Add the following flags. CFG_CONFIG_BUS_CLK : If the 74xx bus frequency can be configured dynamically (such as by switch on board), this flag should be set. CFG_EXCEPTION_AFTER_RELOCATE: If an exception occurs after the u-boot relocates to RAM, this flag should be set. CFG_SERIAL_HANG_IN_EXCEPTION: If the print out function will cause the system hang in exception, this flag should be set. There is a design issue for tsi108/109 pci configure read. When pci scan the slots, if there is no pci card, the tsi108/9 will cause a machine check exception for mpc7448 processor. Signed-off-by: Alexandre Bounine <alexandreb@tundra.com> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
* | | Fix TSEC driver: avoid crashes if PHY is not attachedBen Warren2006-10-26-1/+2
| | | | | | | | | | | | | | | | | | | | | to a TSEC (e.g. a switch is connected via RMII) or if the PHY is defective/incorrectly configured. Signed-off-by: Ben Warren <bwarren@qstreams.com>
* | | Code cleanup.Wolfgang Denk2006-10-26-1/+1
| | |
* | | Finish up support for the ATSTK1000/ATSTK1002 boardsHaavard Skinnemoen2006-10-25-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add atstk1002_config target to Makefile and move the AVR32 section down below Blackfin so that it doesn't end up in the middle of MIPS. Drop the autogenerated linker script thing for now. Will have to revisit how to handle chips with different flash and RAM layout later. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
* | | Fix Makefile for "CHANGELOG" targetWolfgang Denk2006-10-25-3/+4
|\ \ \ | | | | | | | | | | | | Merge with /home/sr/git/u-boot/4xx-idcr