summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Merge git://www.denx.de/git/u-bootNobuhiro Iwamatsu2007-11-29-12/+33
|\ | | | | | | | | | | Conflicts: drivers/Makefile
| * Prepare for 1.3.0 release.Wolfgang Denk2007-11-19-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Update CHANGELOIG, prepare for -rc4Wolfgang Denk2007-11-17-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2007-11-02-0/+4
| |\
| | * ColdFire 54455: Fix correct boot location for atmel and intelTsiChungLiew2007-10-25-0/+4
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| * | Minor coding style cleanup; update CHANGELOGWolfgang Denk2007-10-21-9/+9
| |/ | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * mpc83xx: Add configure entry for MPC83xx ATM supportTony Li2007-10-18-3/+19
| | | | | | | | | | | | | | | | Add MPC8360EMDS_ATM_config and MPC832XEMDS_ATM_config into Makfile and MAKEALL Signed-off-by: Tony Li <tony.li@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * Prepare for 1.3.0-rc3 releaseWolfgang Denk2007-10-14-2/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flashWolfgang Denk2007-10-13-0/+1
| |\
| | * OneNAND support (take #2)Kyungmin Park2007-09-17-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | [PATCH 3/3] OneNAND support (take #2) OneNAND support at U-Boot Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | | sh: Update MakefileNobuhiro Iwamatsu2007-09-23-0/+5
| | | | | | | | | | | | | | | | | | Add support MS7722SE01 to Makefile. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | Merge git://www.denx.de/git/u-bootNobuhiro Iwamatsu2007-09-23-58/+245
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: CREDITS
| * | v1.3.0-rc2Wolfgang Denk2007-09-20-1/+1
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/masterWolfgang Denk2007-09-18-1/+1
| |\ \
| | * | Bugfix: remove embedded null (\0) from CFG_BOOTFILE macro in TQM8540_configGrant Likely2007-09-18-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /bin/bash and /bin/dash (which /bin/sh is linked to on ubuntu) handle embedded nulls in a string differently. For example, the following statement: echo "this is a string\0" > afile Will produce the following with /bin/bash: "this is a string\0" But with /bin/dash, will produce: "this is a string Bug fixed by moving the embedded null out of the makefile and into the config header. Also renamed the macro to avoid usage colision with the same macro used by other board ports. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | MCC200: fix build warningWolfgang Denk2007-09-18-1/+1
| |/ | | | | | | | | | | | | | | The MCC200 board config file includes version.h for some customer- specific setting, which causes warnings with "make depend"; build version.h before depend. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Update MPC8349ITX*_config to place config.tmp in right place.Sam Sparks2007-09-15-3/+3
| | | | | | | | | | | | | | | | MPC834ITX*_config does not store config.tmp at the correct locatation, causing MPC8349ITXGP to have the wrong TEXT_BASE. Signed-off-by: Sam Sparks <SSparks@twacs.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * Update version to match current state.Wolfgang Denk2007-09-10-2/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * PXA270: Added support for TrizepsIV board.stefano babic2007-09-07-0/+3
| | | | | | | | | | | | This patch add support for the Trizeps IV module (520Mhz). Signed-off-by: Stefano Babic <sbabic@denx.de>
| * support board vendor-common makefilesKim Phillips2007-08-29-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a board/$(VENDOR)/common/Makefile exists, build it. also add the first such case, board/freescale/common/Makefile, to handle building board-shared EEPROM, PIXIS, and MDS-PIB code, as dictated by board configuration. thusly get rid of alternate build dir errors such as: FATAL: can't create /work/wd/tmp/u-boot-ppc/board/freescale/mpc8360emds/../common/pq-mds-pib.o: No such file or directory by putting the common/ mkdir command in its proper place (the common Makefile). Common bits from existing individual board Makefiles have been removed. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * Merge with /home/wd/git/u-boot/custodian/u-boot-coldfireWolfgang Denk2007-08-18-0/+67
| |\
| | * ColdFire: Add M5235EVB Platform for MCF523xTsiChungLiew2007-08-17-3/+22
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: Add M54455EVB for MCF5445xTsiChungLiew2007-08-16-0/+28
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: Add M5253EVBE platform for MCF52x2TsiChungLiew2007-08-16-0/+3
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: Add M5249EVB platform for MCF52x2TsiChungLiew2007-08-16-0/+3
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5329 Update and cleanupTsiChungLiew2007-08-16-1/+1
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * Merge branch 'denx-coldfire' into coldfire-aug2007John Rigby2007-08-16-0/+14
| | |\
| | | * Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-15-54/+114
| | | |\
| | | * \ Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescaleStefan Roese2007-07-16-0/+14
| | | |\ \
| | | | * \ Merge branch 'master' into u-boot-5329-earlyJohn Rigby2007-07-10-3/+11
| | | | |\ \
| | | | * | | Revert file modeTsiChungLiew2007-07-10-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed MAKEALL file mode to executable, removed executable file mode from Makefile Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | | | * | | Added M5329AFEE and M5329BFEE PlatformsTsiChung Liew2007-06-18-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added board/freescale/m5329evb, cpu/mcf532x, drivers/net, drivers/serial, immap_5329.h, m5329.h, mcfrtc.h, include/configs/M5329EVB.h, lib_m68k/interrupts.c, and rtc/mcfrtc.c Modified CREDITS, MAKEFILE, Makefile, README, common/cmd_bdinfo.c, common/cmd_mii.c, include/asm-m68k/byteorder.h, include/asm-m68k/fec.h, include/asm-m68k/io.h, include/asm-m68k/mcftimer.h, include/asm-m68k/mcfuart.h, include/asm-m68k/ptrace.h, include/asm-m68k/u-boot.h, lib_m68k/Makefile, lib_m68k/board.c, lib_m68k/time.c, net/eth.c and rtc/Makefile Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| * | | | | | mpc83xx: move freescale boards to boards/freescaleKim Phillips2007-08-16-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes build fixes. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | | | | Move the MPC8641HPCN board under board/freescale.Jon Loeliger2007-08-15-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Minor path corrections needed to ensure buildability. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | | | Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-14-52/+100
| |\ \ \ \
| | * | | | 85xxCDS: Add make targets for legacy systems.Randy Vinson2007-08-14-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PCI ID select values on the Arcadia main board differ depending on the version of the hardware. The standard configuration supports Rev 3.1. The legacy target supports Rev 2.x. Signed-off-by Randy Vinson <rvinson@mvista.com>
| | * | | | Add support for UEC to 8568Andy Fleming2007-08-14-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| | * | | | Merge commit 'remotes/wd/master'Jon Loeliger2007-08-13-0/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAKEALL With any luck, this is the last MAKEALL merge conflict!
| | | * \ \ \ Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-10-8/+11
| | | |\ \ \ \
| | | * | | | | [ARM] TI DaVinci support, hopefully finalSergey Kubushyn2007-08-10-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the following DaVinci boards: - DV_EVM - SCHMOOGIE - SONATA Changes: - Split into separate board directories - Removed changes to MTD_DEBUG (or whatever it's called) - New CONFIG_CMD party line followed - Some cosmetic fixes, cleanup etc. - Patches against the latest U-Boot tree as of now. - Fixed CONFIG_CMD_NET in net files. - Fixed CONFIG_CMD_EEPROM for schmoogie. - Made sure it compiles and works (forceenv() link problem) on SCHMOOGIE and DV_EVM. Can't check if it works on SONATA, don't have a board any more, but it at least compiles. Here is an excerpt from session log on SCHMOOGIE... U-Boot 1.2.0-g6c33c785-dirty (Aug 7 2007 - 13:07:17) DRAM: 128 MB NAND: 128 MiB In: serial Out: serial Err: serial ARM Clock : 297MHz DDR Clock : 162MHz ETH PHY : DP83848 @ 0x01 U-Boot > iprobe Valid chip addresses: 1B 38 3A 3D 3F 50 5D 6F U-Boot > ping 192.168.253.10 host 192.168.253.10 is alive U-Boot > Signed-off-by: Sergey Kubushyn <ksi@koi8.net> Acked-by: Dirk Behme <dirk.behme@gmail.com> Acked-by: Zach Sadecki <Zach.Sadecki@ripcode.com> Acked-by: Stefan Roese <sr@denx.de>
| | * | | | | | Add support for SBC8641D. Config files.Joe Hamman2007-08-10-0/+2
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Wind River's SBC8641D reference board. Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com> Acked-by: Wolfgang Denk <wd@denx.de> Acked-by: Jon Loeliger <jdl@freescale.com>
| | * | | | | mpc83xx: add support for the MPC8323E RDBKim Phillips2007-08-10-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPC8323E based board with 64MB fixed SDRAM, 16MB flash, five 10/100 ethernet ports connected via an ICPlus IP175C switch, one PCI slot, and serial. Features not supported in this patch are SD card interface, 2 USB ports, and the two phone ports. Signed-off-by: Michael Barkowski <michael.barkowski@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | | | MPC83xx: Fix makefile to generate config.h file in the build directorydavid.saada2007-08-10-8/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPC83xx: Fix the Makefile config sections to generate the include/config.h file in the build directory instead of the source directory. Signed-off-by: David Saada <david.saada@ecitele.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | | Merge with git+ssh://atlas/home/wd/git/u-boot/masterWolfgang Denk2007-08-09-0/+1
| | |\ \ \ \
| | | * \ \ \ Merge with /home/wd/git/u-boot/workWolfgang Denk2007-08-09-0/+1
| | | |\ \ \ \
| | | | * | | | Treat ppc64 host as ppcKumar Gala2007-08-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | | | | | Merge with git://www.denx.de/git/u-boot.gitMarkus Klotzbuecher2007-08-07-55/+86
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge with /home/tur/git/u-boot#cm5200-siWolfgang Denk2007-08-07-7/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | cm1_qp1 -> cm5200: single U-Boot image for modules from the cm5200 family.Bartlomiej Sieka2007-08-03-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability for modules from the Schindler cm5200 family to use a single U-Boot image: - rename cm1_qp1 to cm5200 - add run-time module detection - parametrize SDRAM configuration according to the module we are running on Few minor, board-specific fixes included in this patch: - better MAC address handling - updated default environment ('update' command uses +{filesize} now) - improved error messages in the auto-update code - allow booting U-Boot from RAM (CFG_RAMBOOT) Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com> Signed-off-by: Piotr Kruszynski <ppk@semihalf.com> Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | | * | | | | Merge with /home/wd/git/u-boot/custodian/u-boot-testingWolfgang Denk2007-08-06-0/+1
| | | |\ \ \ \ \