summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2008-02-22-1/+1
|\
| * ColdFire: Fix missing code flash size for M5485EVBTsiChungLiew2008-02-20-1/+1
| | | | | | | | | | Signed-off-by: James Mahan <kmahan@freescale.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
* | error check autoconf.mk generationMike Frysinger2008-02-22-0/+1
| | | | | | | | | | | | | | | | If any of the steps for generating autoconf.mk fail currently, they go unnoticed. To fix, we can simply add 'set -e' to the long list of commands. This is simpler and more robust than placing '|| exit $$?' after every line. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Fix bug in dependency checkingStefano Babic2008-02-22-1/+1
| | | | | | | | | | | | | | | | By adding VERSION_FILE to the PHONY targets the script /tools/setlocalversion is always called and version_autogenerated.h is replaced only if the script find a modified source file. Signed-off-by: Stefano Babic <sbabic@denx.de>
* | Makefile: add target for $(LDSCRIPT)Mike Frysinger2008-02-22-0/+3
|/ | | | | | | | | | | | | | | If the $(LDSCRIPT) does not exist (normally it's board/$(BOARD)/u-boot.lds), then change into the board directory and try and create it. This allows you to generate the linker script on the fly based upon board defines (like the Blackfin boards do). There should be no regressions due to this change as the normal case is to already have a u-boot.lds file. If that's the case, then there's nothing to generate, and so make will always exit. The fix here is that if the linker script does not exist, the implicit rules take over and attempt to guess how to generate the file. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-1/+1
|\
| * Move AT91RM9200DK board support under board/atmelHaavard Skinnemoen2008-02-14-1/+1
| | | | | | | | | | | | We already have a vendor subdir for Atmel, so we should use it. Signed-off-by: Haavard Skinnemoen <hskinnemoen <at> atmel.com>
* | Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-0/+2
|\ \
| * | Support for Artila M-501 starter kitTimo Tuunainen2008-02-14-0/+2
| | | | | | | | | | | | | | | Kimmo Leppala / Sysart and Timo Tuunainen / Sysart
* | | Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-0/+3
|\ \ \
| * | | AT91CAP9 support : move board files to Atmel vendor directory.Stelian Pop2008-02-14-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | AT91CAP9 support : move at91cap9adk board files to Atmel vendor directory. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | AT91CAP9 support : build integrationStelian Pop2008-02-14-0/+3
| |/ / | | | | | | | | | Signed-off-by: Stelian Pop <stelian@popies.net>
* | | Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-10/+1
|\ \ \
| * | | Update board NetStarPeter Pearse2008-02-14-10/+1
| |/ / | | | | | | | | | Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
* | | Prepare v1.3.2-rc1 release candidateWolfgang Denk2008-02-15-2/+2
| | |
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-02-15-0/+2
|\ \ \
| * \ \ Merge branch 'for-1.3.2'Stefan Roese2008-02-14-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | ppc4xx: HCU4/5. Fix make O=../xxNiklaus Giger2008-02-14-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-blackfinWolfgang Denk2008-02-15-24/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile doc/README.standalone Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | generate u-boot.ldr for Blackfin targetsMike Frysinger2008-02-04-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | move Blackfin cpu object list to respective cpu directoriesMike Frysinger2008-02-04-12/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | add support for Blackfin symbol prefixes to examplesMike Frysinger2008-02-04-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | unify the Blackfin board targetsMike Frysinger2008-02-04-11/+10
| | |/ / | |/| | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | | only update version header as neededMike Frysinger2008-02-14-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constantly rebuilding the version header will force useless relinking, so we simply need to compare the new header with the existing one before updating it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | | OneNAND Initial Program Loader (IPL) supportKyungmin Park2008-02-14-1/+17
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the OneNAND boot within U-Boot. Before this work, we used another OneNAND IPL called X-Loader based on open source. With this work, we can build the oneboot.bin image without other program. The build sequence is simple. First, it compiles the u-boot.bin Second, it compiles OneNAND IPL Finally, it becomes the oneboot.bin from OneNAND IPL and u-boot.bin The mechanism is similar with NAND boot except it boots from itself. Another thing is that you can only use the OneNAND IPL only to work other bootloader such as RedBoot and so on. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | | Add dependencies to avoid race conditions with parallel make.Johannes Stezenbach2008-02-14-3/+3
| | | | | | | | | | | | Signed-off-by: Johannes Stezenbach <js@sig21.net>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-02-12-7/+2
|\ \ \ | |_|/ |/| |
| * | API: Convert conditional building to the new scheme.Rafal Jaworowski2008-01-29-7/+2
| |/ | | | | | | | | | | | | This fixes a build breakage with CONFIG_API enabled, which appeared after the recent changes in the U-Boot build system. Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
* | ARM: Board voiceblue updateLadislav Michl2008-02-04-13/+1
|/ | | | Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
* Merge branch 'master' of git://www.denx.de/git/u-boot-ixpWolfgang Denk2008-01-23-0/+12
|\
| * Add AcTux board supportMichael Schwingen2008-01-18-0/+12
| | | | | | | | | | | | | | | | | | | | | | Hi, The patch adds 4 boards, called AcTux-1 .. AcTux-4. This patch contains the files that contain changes for multiple boards, the board-specific files follow as separate patches. Signed-off-by: Michael Schwingen <michael@schwingen.org>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2008-01-23-0/+6
|\ \
| * \ Merge branch 'master' of git://www.denx.de/git/u-bootShinya Kuribayashi2008-01-18-0/+8
| |\ \ | | |/
| * | MIPS:Target support for qemu -M mipsVlad Lungu2008-01-17-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | With serial, NE2000, IDE support. Tested in big-endian mode. Memory size hard-coded to 128M for now, so don't play with the -m option. Signed-off-by: Vlad Lungu <vlad@comsys.ro>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-avr32Wolfgang Denk2008-01-23-0/+3
|\ \ \
| * | | AVR32: ATNGW100 board supportHaavard Skinnemoen2008-01-18-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | Add support for the ATNGW100 Network Gateway reference design, including flash, ethernet and MMC support. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2008-01-23-0/+84
|\ \ \
| * | | ColdFire: MCF547x_8x - Add M5475EVB and M5485EVB supportTsiChungLiew2008-01-17-0/+71
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com> Signed-off by: John Rigby <jrigby@freescale.com>
| * | | ColdFire: Add MCF5227x cpu and M52277EVB support-1TsiChungLiew2008-01-17-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com> Signed-off by: John Rigby <jrigby@freescale.com>
| * | | ColdFire: Add M5373EVB platform support - 2TsiChungLiew2008-01-17-0/+10
| |/ / | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com> Signed-off by: John Rigby <jrigby@freescale.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-01-23-0/+3
|\ \ \
| * \ \ Merge branch 'master' of /home/stefan/git/u-boot/u-bootStefan Roese2008-01-17-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | ppc4xx: Complete DU440 board supportMatthias Fuchs2008-01-17-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | | Add support for a Freescale non-CPM SPI controllerBen Warren2008-01-17-0/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the SPI controller found on Freescale PowerPC processors such as the MCP834x family. Additionally, a new config option, CONFIG_HARD_SPI, is added for general purpose SPI controller use. Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-shWolfgang Denk2008-01-16-0/+8
|\ \ \ | |_|/ |/| |
| * | sh: Add support for MS7720RP02 boardYoshihiro Shimoda2008-01-15-0/+8
| |/ | | | | | | | | | | Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> CC: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Add support for the MPC837xERDBKim Phillips2008-01-16-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MPC837xERDB board support includes: * DDR2 330MHz hardcoded (soldered on the board) * Local Bus NOR Flash * I2C, UART and RTC * eTSEC RGMII (TSEC0 - RTL8211B with MII; * TSEC1 - VSC7385 local bus, hardcoded, requires seperate firmware * load) Signed-off-by: Kevin Lam <kevin.lam@freescale.com> Signed-off-by: Joe D'Abbraccio <joe.d'abbraccio@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | mpc83xx: Add the support for MPC8315ERDB boardDave Liu2008-01-16-0/+3
|/ | | | | | | | | | | | | The features list: - Boot from NOR Flash - DDR2 266MHz hardcoded configuration - Local bus NOR Flash R/W operation - I2C, UART, MII and RTC - eTSEC0/1 support - PCI host Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* Fix Makefile dependency problem with parallel builds.Wolfgang Denk2008-01-13-7/+6
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix Makefile dependencies issues; allow silent buildWolfgang Denk2008-01-13-183/+190
| | | | | | | | | - get rid of "version" target whichdidn't really work - make autoconf.mk depend on version_autogenerated.h to make sure to rebuild files as needed - add XECHO macro to allow for silent build using "make -s" Signed-off-by: Wolfgang Denk <wd@denx.de>