summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* fix unconfigured out-of-tree building of toolsMike Frysinger2011-07-26-0/+1
| | | | | | | | | | | | | Now that the tools target requires the generated version header file, we need to make sure that the directory it writes to exists. In a configured tree, this is taken care of for us. But in an unconfigured one, the dir does not yet exist causing a build error like so: /bin/sh: line 5: ..../u-boot_build/include/version_autogenerated.h.tmp: No such file or directory So create the dir for this file before we attempt to generate it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* simplify clobber behavior with out-of-tree buildsMike Frysinger2011-07-26-4/+1
| | | | | | | | The targets/prerequisites are the same here; the rules only differ in the recipes. So move the if logic protection to the recipe part so we can keep the rest the same. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Hook SPL build-system into toplevel MakefileDaniel Schwierzeck2011-07-26-0/+5
| | | | | Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
* Extend build-system for SPL frameworkDaniel Schwierzeck2011-07-26-1/+2
| | | | | Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
* Use ALL-y style instead of ifeq blocks for better readabilityDaniel Schwierzeck2011-07-26-14/+6
| | | | Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
* Makefile: need to remove generated u-boot-nand_spl.ldsKumar Gala2011-07-01-1/+1
| | | | | | | | On MPC85xx based NAND_SPL builds we generate a u-boot-nand_spl.lds based on output from preprocessor. We where never removed it. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Scott Wood <scottwood@freescale.com>
* nios2: move generic config to boards.cfgMike Frysinger2011-06-30-14/+0
| | | | | | | | | I can't build test this, but just looking at the config files written and it seems OK ... Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* Prepare v2011.06v2011.06Wolfgang Denk2011-06-27-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* usb: convert to partial linkingMike Frysinger2011-06-25-1/+1
| | | | | | Looks like this was missed during the conversion to partial linking. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Makefile: move $(VERSION_FILE) rule out of ifeq configuredIlya Yanok2011-06-22-18/+18
| | | | | | | | | mkimage relies on autogenerated version so we need to move $(VERSION_FILE) rule out of ifeq and make tools rule depend on it to be able to run 'make tools' from the unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* config.mk: move LDSCRIPT processing to the top-level MakefileIlya Yanok2011-06-22-0/+30
| | | | | | | | | | LDSCRIPT is used only from the top-level Makefile and only when the system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT related logic into the top level Makefile and under configured condition to avoid errors when building tools from unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* ARM: drop unsupported 'trab' boardWolfgang Denk2011-06-22-24/+1
| | | | | | | | | | The 'trab' board configuration is broken, and there is nobody who is interested and willing to fix it. Drop it. This includes support for VFD displays which have always been used by this board only. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2011.06-rc3v2011.06-rc3Wolfgang Denk2011-06-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* cpu9260/9G20: fix board supportEric Benard2011-06-21-8/+0
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:Reinhard Meyer2011-06-21-37/+0
| | | | | | Make ATMEL's at91sam9260/9g20/9xe-ek boards build again Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* Prepare v2011.06-rc2v2011.06-rc2Wolfgang Denk2011-06-02-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* ARMV7: MMC SPL Boot support for SMDKV310 boardChander Kashyap2011-05-26-0/+11
| | | | | | | | Added MMC SPL boot support for SMDKV310. This framework design is based on nand_spl support. Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* Prepare v2011.06-rc1v2011.06-rc1Wolfgang Denk2011-05-19-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* examples: add smc911x_eeprom to clean targetMike Frysinger2011-05-12-1/+1
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* zlib: split up to match original source treeMike Frysinger2011-04-30-0/+1
| | | | | | | | | | | | | | | | | | While looking to upgrade to zlib-1.2.5, the current mondo merge of multiple files into a single was making things way more difficult than it should have been. Hard to pick out what has been changed to port it to U-Boot, been removed as useless, and bug fixes added after the fact. So split the single file up into the original file names, and merge non-essential changes back from the original tree (for some reason, style in code in a bunch of places was changed to U-Boot style even though this isn't "U-Boot" code). The original build style is retained -- we have a single zlib.c that includes all the other files, and that is the only file we compile. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* nhk8815: move config targets from Makefile to boards.cfgAlessandro Rubini2011-04-27-9/+0
| | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
* cpuat91: fix board supportEric Benard2011-04-27-10/+0
| | | | | | | | - fix board support following relocation changes - switch to boards.cfg - disable i2c to keep size under 128kiB (1 sector) Signed-off-by: Eric Bénard <eric@eukrea.com>
* Makefile: change rule to build IMX imageStefano Babic2011-04-27-1/+1
| | | | | | | | config.mk in board directory is obsolete and should be removed. The patch allows to get rid of own config.mk adding the imximage.cfg file to the options in the boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
* x86: Rename i386 to x86Graeme Russ2011-04-13-2/+2
| | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* mkimage: add "-V" option to print version informationWolfgang Denk2011-04-12-2/+6
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix NAND_SPL and ONENAND_IPL in MakefileHaiying Wang2011-04-01-16/+14
| | | | | Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* Prepare v2011.03v2011.03Wolfgang Denk2011-03-31-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare vv2011.03-rc2Wolfgang Denk2011-03-27-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Add USB host ethernet adapter supportSimon Glass2011-02-19-0/+1
| | | | | | | | | | | | This adds support for using USB Ethernet dongles in host mode. This is just the framework - drivers will come later. A new config option called CONFIG_USB_HOST_ETHER can be defined in board config files to switch this on. The was originally written by NVIDIA and was cleaned up for release by the Chromium authors. Signed-off-by: Simon Glass <sjg@chromium.org>
* MIPS: Move VCT boards to boards.cfgShinya Kuribayashi2011-02-07-32/+0
| | | | | Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com> Acked-by: Stefan Roese <sr@denx.de>
* MIPS: Move Inca-IP targets to boards.cfgShinya Kuribayashi2011-02-05-13/+0
| | | | | | At the same time, fix up CPU_CLOCK_RATE to have the CONFIG_ prefix to work with boards.cfg. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* MIPS: Move Qemu MIPS target to boards.cfgShinya Kuribayashi2011-02-05-5/+0
| | | | | | CONFIG_QEMU_MIPS is already provided by <configs/qemu-mips.h>, so we don't generate it using the options fields in boards.cfg. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* MIPS: Move Alchemy Au1x00 based boards to boards.cfgShinya Kuribayashi2011-02-05-39/+0
| | | | | | CONFIG_GTH2 is already provided by <configs/gth2.h>, so we don't generate it using the options fields in boards.cfg. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* Prepare v2011.03-rc1v2011.03-rc1Wolfgang Denk2011-02-02-3/+3
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Print compiler and linker version with the version commandAlexander Holler2011-02-02-0/+4
| | | | | | | | | | | | | | | | | After years of unsuccessful research I've finally shamelessly stolen other peoples intellectual properties to present the all-new and world-changing updated version command: - U-Boot>> version U-Boot 2010.12-00014-g7435056-dirty (Jan 18 2011 - 23:19:38) MyBoard gcc (GCC) 0.42 (Distro foobar) GNU ld (GNU Binutils) 0.314159265 - May the toolchain bugs rest in peace. Signed-off-by: Alexander Holler <holler@ahsoftware.de>
* Divides variable of linker flags to LDFLAGS-u-boot and LDFLAGSNobuhiro Iwamatsu2011-01-25-1/+1
| | | | | | | | | | Linker needs to use the proper endian/bfd flags even when doing partial linking. LDFLAGS_u-boot sets linker option which is called it when U-boot is built (u-boot final). LDFLAGS sets necessary option by partial linking (use in cmd_link_o_target). CC: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Cleanup .boards.depend when using an objtreeLoïc Minier2011-01-21-2/+2
| | | | | | | | | .boards.depend was created in the source tree even when calling make with O=objtree, and distclean O=objtree wouldn't clean it. Create .boards.depend in objtree instead as to clean it up properly. Reported-by: Loïc Minier <loic.minier@linaro.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Don't add symlink in srctree when using an objtreeLoïc Minier2011-01-21-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When building with srctree != objtree, the build creates arch/soc/cpu specific symlinks in the source tree. This means that the same source tree can't be used for multiple builds at the same time. Also, these symlinks in the source tree are only cleaned up if one passes the same O= to distclean. When srctree != objtree, mkconfig creates an $objtree/include2 directory in the objtree to host the asm -> arch/$arch/include/asm symlink so that "#include <asm>" can be used. But it also creates another identical symlink in $objtree/include. Then, mkconfig creates two symlinks: $objtree/include/asm/arch -> arch/$arch/include/asm/arch-$cpu (or $soc) $objtree/include/asm/proc -> arch/$arch/include/asm/proc-armv (on arm) but because $objtree/include/asm points at $srctree already, the two symlinks are created under $srctree. To fix this, create a real $objtree/include/asm directory, instead of a symlink. Update cleanup code accordingly. Signed-off-by: Loïc Minier <loic.minier@linaro.org>
* Prepare v2010.12v2010.12Wolfgang Denk2010-12-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2010.12-rc3v2010.12-rc3Wolfgang Denk2010-12-17-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* video: move fsl_diu_fb driver to drivers/videoAnatolij Gustschin2010-12-01-3/+0
| | | | | | | | | Since the driver is used not only on Freescale boards, we move it to a common place for video drivers as suggested by Wolfgang. The patch also cleans up the top level Makefile. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Prepare v2010.12-rc2v2010.12-rc2Wolfgang Denk2010-11-28-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* 512x: Cleanup for partial linking and --gc-sectionsWolfgang Denk2010-11-27-1/+4
| | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Cc: Timur Tabi <timur@freescale.com> Acked-by: Stefan Roese <sr@denx.de>
* Makefile: Fix build with USE_PRIVATE_LIBGCCMatthias Weisser2010-11-18-1/+1
| | | | | | | If USE_PRIVATE_LIBGCC is set the yes building fails with a missing libgcc.a As we use partial linking now it is libgcc.o now. Signed-off-by: Matthias Weisser <weisserm@arcor.de>
* Switch from archive libraries to partial linkingSebastien Carlier2010-11-17-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, weak symbols were not overridden by non-weak symbols found in archive libraries when linking with recent versions of binutils. As stated in the System V ABI, "the link editor does not extract archive members to resolve undefined weak symbols". This commit changes all Makefiles to use partial linking (ld -r) instead of creating library archives, which forces all symbols to participate in linking, allowing non-weak symbols to override weak symbols as intended. This approach is also used by Linux, from which the gmake function cmd_link_o_target (defined in config.mk and used in all Makefiles) is inspired. The name of each former library archive is preserved except for extensions which change from ".a" to ".o". This commit updates references accordingly where needed, in particular in some linker scripts. This commit reveals board configurations that exclude some features but include source files that depend these disabled features in the build, resulting in undefined symbols. Known such cases include: - disabling CMD_NET but not CMD_NFS; - enabling CONFIG_OF_LIBFDT but not CONFIG_QE. Signed-off-by: Sebastien Carlier <sebastien.carlier@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk2010-10-29-1/+1
|\ | | | | | | | | | | | | Conflicts: include/configs/km_arm.h Signed-off-by: Wolfgang Denk <wd@denx.de>
| * kirkwood: get rid of config.mk filesPrafulla Wadaskar2010-10-28-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After moving the definition of CONFIG_SYS_TEXT_BASE to the respective board config files, all Marvell kirkwood board have just a single and common entry in their config.mk files: KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg Replace the only reference to KWD_CONFIG in the top level Makefile by an equivalent setting, and remove all kirkwood config.mk files. Signed-off-by: Wolfgang Denk <wd at denx.de> Cc: Prafulla Wadaskar <prafulla at marvell.com> Cc: Siddarth Gore <gores at marvell.com> Cc: Simon Kagstrom <simon.kagstrom at netinsight.net> Cc: Heiko Schocher <hs at denx.de> Cc: Eric Cooper <ecc at cmu.edu> Acked-by: Wolfgang Denk <wd at denx.de> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
* | Drop support for CONFIG_SKIP_RELOCATE_UBOOTWolfgang Denk2010-10-29-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For ARM systems, before ELF relocation was introduced, CONFIG_SKIP_RELOCATE_UBOOT coul be used to prevent *COPYING* the U-Boot image from whereever it was loaded to it's link address (CONFIG_SYS_TEXT_BASE). The name was badly chosen, as no relocation was performed at all, it was just a memcpy(). With ELF relocation, this does not work like that any more, and related boards need to be fixed anyway. So don't keep this relict any longer. Signed-off-by: Wolfgang Denk <wd@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* | Prepare v2010.12-rc1v2010.12-rc1Wolfgang Denk2010-10-27-2/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Makefile: fix dependencies for building NAND_SPLWolfgang Denk2010-10-27-1/+1
| | | | | | | | | | | | | | | | Building of NAND based boards failed sometimes (especially on MP systems) because of incorrect / missing dependencies. Signed-off-by: Wolfgang Denk <wd@denx.de> Tested-by: Heiko Schocher <hs@denx.de>