summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Merge remote branch 'u-boot-ppc4xx/master'Wolfgang Denk2008-06-02-0/+3
|\
| * Merge branch 'quad100hd'Stefan Roese2008-05-21-0/+3
| |\
| | * ppc4xx: Add the Harris QUAD100HD AMCC 405EP-based boardGary Jennejohn2008-05-08-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Gary Jennejohn <garyj@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | Initial support for "Socrates" boardSergei Poselenov2008-05-20-0/+3
|/ / | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | Release v1.3.3Wolfgang Denk2008-05-19-1/+1
| | | | | | | | | | | | Update CHANGELOG for release. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Makefile: fix "error: version_autogenerated.h: No such file or directory"Wolfgang Denk2008-05-13-4/+10
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Avoid infinite loop "Generating include/autoconf.mk"Wolfgang Denk2008-05-09-1/+1
|/ | | | | | | Fix a bogus circular dependency that caused an infinite loop of "Generating include/autoconf.mk" again and again. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare for v1.3.3-rc3Wolfgang Denk2008-05-04-1/+1
| | | | | | Update ChNAGELOG, minor white space cleanup. Signed-off-by: Wolfgang Denk <wd@denx.de>
* version_autogenerated.h: use printf rather than echo -nMike Frysinger2008-05-04-5/+3
| | | | | | | | Some systems are dumb and do not implement the -n flag to echo (like OS X). Convert the Makefile to use printf as this should work everywhere. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Makefile: fix parallel buildsWolfgang Denk2008-04-30-4/+10
| | | | | | | | | | | | | | | | | | | | | This problem shows up with parallel builds only; it results in somewhat cryptic error messages like $ JOBS=-j6 MAKEALL netstar Configuring for netstar board... arm-linux-ld: cannot find -lgeneric make[1]: *** [eeprom.srec] Error 1 A few boards (like netstar and voiceblue) need some libraries for building; however, the board Makefile does not contain any such dependencies which may cause problems with parallel builds. Adding such dependencies is difficult as we would also have to provide build rules, which already exist in the respective library Makefiles. To solve this, we make sure that all libraries get built before the board code. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v1.3.3-rc2Wolfgang Denk2008-04-29-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v1.3.3-rc1Wolfgang Denk2008-04-26-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of /home/wd/git/u-boot/lwmon5Wolfgang Denk2008-04-25-9/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/cmd_bootm.c common/cmd_log.c include/common.h post/board/lwmon5/Makefile post/board/lwmon5/dsp.c post/board/lwmon5/dspic.c post/board/lwmon5/fpga.c post/board/lwmon5/gdc.c post/board/lwmon5/sysmon.c post/board/lwmon5/watchdog.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * POST: move CONFIG_POST to MakefilesYuri Tikhonov2008-04-22-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the new logical option CONFIG_HAS_POST which is set when the platform has CONFIG_POST set. Use CONFIG_HAS_POST in the post/ Makefiles to determine should the POST libs be compiled for the selected target platform, or not. To avoid breaking u-boot linking process, the empty post/libpost.a file is created for platforms which do not have POSTs. Signed-off-by: Yuri Tikhonov <yur@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | crc32: use uint32_t rather than unsigned longMike Frysinger2008-04-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The envcrc.c does sizeof(unsigned long) when calculating the crc, but this is done with the build toolchain instead of the target tool chain, so if the build is a 64bit system but the target is 32bits, the size will obviously be wrong. This converts all unsigned long stuff related to crc32 to uint32_t types. Compile tested only: output of ./tools/envcrc when run on a 32bit build system matches that of a 64bit build system. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-04-22-1/+4
|\ \
| * | ppc4xx: Add Glacier NAND booting targetStefan Roese2008-04-18-1/+4
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | | Makefile: remove nand_spl/System.map when cleaning up.Wolfgang Denk2008-04-20-1/+2
| | |
* | | Support for the MX31ADS evaluation board from FreescaleGuennadi Liakhovetski2008-04-18-0/+3
|/ / | | | | | | | | | | | | | | This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | Reorder ARM boards in MakefileUlf Samuelsson2008-04-18-15/+23
| | | | | | | | | | | | | | | | Rearrange ARM boards in Makefile so that ARM926EJ-S boards are no longer under ARM92xT header. Signed-off-by: Ulf Samuelsson <ulf@atmel.com> Ack-By Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Fix dependency generation for older gcc versionsVlad Lungu2008-04-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | With gcc 3.3.3 at least, compilation fails with Generating include/autoconf.mk gcc: compilation of header file requested make: *** [include/autoconf.mk] Error 1 since commit 16fe77752eee099b9fb61ed73460e51cc94b37ba. Signed-off-by: Vlad Lungu <vlad@comsys.ro>
* | Allow use of ARCH=powerpc when buildingKumar Gala2008-04-13-0/+4
| | | | | | | | | | | | | | The linux kernel is now mostly ARCH=powerpc, so to make life easier allow use to use ARCH=powerpc and convert it to ARCH=ppc. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Support for LinkStation / KuroBox HD and HG PPC modelsGuennadi Liakhovetski2008-04-13-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on the port by Mihai Georgian (see linkstation.c for Copyright information) and implements support for LinkStation / KuroBox HD and HG PPC models from Buffalo Technology, whereby HD is deactivated at the moment, pending network driver fixing. Notice to users: this is pretty much a barebone port. Support for network on HG models is already in the U-Boot mainline, but you might also want patches to switch fan / phy modes depending on the negotiated ethernet parameters. This patch also doesn't support console switching, booting EM mode, Buffalo specific ext2 magic number. So, if you want to use any of those, you need additional patches. Otherwise this patche provides a fully functional u-boot with a network console on your system. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | Phytec Phycore-i.MX31 supportSascha Hauer2008-04-13-0/+3
| | | | | | | | | | | | | | This patch adds support for the Phytec Phycore-i.MX31 board Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | mx31 litekit supportSascha Hauer2008-04-13-0/+3
| | | | | | | | | | | | | | This patch adds support for the mx31 litekit board Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | Separate omap24xx specific code from arm1136Sascha Hauer2008-04-13-2/+2
| | | | | | | | | | | | | | | | Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136 to cpu/arm1136/omap24xx. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-sparcWolfgang Denk2008-04-13-1/+36
|\ \
| * | SPARC/LEON2: added support for Gaisler simulator GRSIM/TSIM for SPARC/LEON2 ↵Daniel Hellstrom2008-04-08-0/+4
| | | | | | | | | | | | | | | | | | targets. See www.gaisler.com for information. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC/LEON3: added support for GR-CPCI-AX2000 FPGA AX board. The FPGA is ↵Daniel Hellstrom2008-04-08-0/+4
| | | | | | | | | | | | | | | | | | exchangeable but a standard LEON3 design is assumed. See www.gaisler.com for information. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC/LEON3: added support for Altera NIOS Development kit (STRATIX II ↵Daniel Hellstrom2008-04-08-0/+5
| | | | | | | | | | | | | | | | | | Edition) with GRLIB template design. See www.gaisler.com for information. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC/LEON3: added support for Gaisler GRSIM/TSIM2 SPARC/LEON3 simulatorn. ↵Daniel Hellstrom2008-04-08-0/+4
| | | | | | | | | | | | | | | | | | See www.gaisler.com for information. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC/LEON3: added support for GR-XC3S-1500 board with GRLIB template ↵Daniel Hellstrom2008-04-08-0/+4
| | | | | | | | | | | | | | | | | | design. See www.gaisler.com for board information. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC: Added support for SPARC LEON2 SOC Processor.Daniel Hellstrom2008-04-08-0/+4
| | | | | | | | | | | | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC: Added support for SPARC LEON3 SOC processor.Daniel Hellstrom2008-04-08-0/+3
| | | | | | | | | | | | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
| * | SPARC: Added generic support for SPARC architecture.Daniel Hellstrom2008-04-08-1/+8
| | | | | | | | | | | | Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
* | | Revert merge of git://www.denx.de/git/u-boot-arm, commit 62479b18:Wolfgang Denk2008-04-11-14/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting became necessary after it turned out that the patches in the u-boot-arm repo were modified, and in some cases corrupted. This reverts the following commits: 066bebd6353e33af3adefc3404560871699e9961 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6 c88ae20580b2b01487b4cdcc8b2a113f551aee36 a147e56f03871bba4f05058d5e04ce7deb010b04 d6674e0e2a6a1f033945f78838566210d3f28c95 8c8463cce44d849e37744749b32d38e1dfb12e50 c98b47ad24b2d91f41c09a3d62d7f70ad84f4b7d 8bf69d81782619187933a605f1a95ee1d069478d 8c16cb0d3b971f46fbe77c072664c0f2dcd4471d a574a73852a527779234e73e17e7597fd8128882 1377b5583a48021d983e1fd565f7d40c89e84d63 1704dc20917b4f71e373e2c888497ee666d40380 Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-at91Wolfgang Denk2008-04-08-1/+4
|\ \
| * | Add support for AT91SAM9260EKStelian Pop2008-04-01-0/+3
| | | | | | | | | | | | | | | | | | | | | Support for booting from internal DataFlash, external DataFlash card or NAND flash is available. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | Move at91cap9 specific files to at91sam9 directoryStelian Pop2008-04-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | AT91CAP9 and AT91SAM9 SoCs are very close hardware wise, so a common infrastructure can be used. Let this infrastructure be named after the AT91SAM9 family, and move the existing AT91CAP9 files to the new place. Signed-off-by: Stelian Pop <stelian@popies.net>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2008-04-08-3/+3
|\ \ \
| * | | ColdFire: Remove R5200 boardTsiChung Liew2008-03-31-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board never went into production Signed-off-by: Zachary P. Landau <zachary.landau@labxtechnologies.com> Acked-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | ColdFire: Added M5275EVB support.Matthew Fettke2008-03-31-0/+3
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Matthew Fettke <mfettke@videon-central.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-blackfinWolfgang Denk2008-04-08-2/+3
|\ \ \
| * | | Blackfin: unify cpu and boot modesMike Frysinger2008-03-30-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | All of the duplicated code for Blackfin processors and boot modes have been unified. After all, the core is the same for all processors, just the peripheral set differs (which gets handled in the drivers). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-armWolfgang Denk2008-04-08-2/+14
|\ \ \
| * | | Support for the MX31ADS evaluation board from FreescaleGuennadi Liakhovetski2008-03-30-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * | | Phytec Phycore-i.MX31 supportSascha Hauer2008-03-30-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Phytec Phycore-i.MX31 board Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * | | mx31 litekit supportSascha Hauer2008-03-30-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the mx31 litekit board Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * | | Separate omap24xx specific code from arm1136Sascha Hauer2008-03-30-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move omap24xx code to cpu/arm1136/omap24xx, rename include/asm-arm/arch-arm1136 to cpu/arm1136/omap24xx. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| * | | Adds support for the Prodrive PMDRA board, based on a DM6441Pieter Voorthuijsen2008-03-30-0/+3
| |/ / | | | | | | | | | Signed-off-by: Pieter Voorthuijsen <pv@prodrive.nl>