summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* 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>
* | include/asm-offsets.h: automatically generate assembler constantsWolfgang Denk2010-10-26-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recurrent issue is that certain C level constructs like sizeof() or offsetof() cannot be used in assembler files, which is inconvenient when such constructs are used in the definition of macro names etc. To avoid duplication of such definitions (and thus another cause of problems), we adapt the Linux way to automatically generate the respective definitions from the respective C header files. In Linux, this is implemented in include/linux/kbuild.h, Kbuild, and arch/*/kernel/asm-offsets.c; we adapt the code from the Linux v2.6.36 kernel tree. We also copy the concept of the include/generated/ directory which can be used to hold other automatically generated files as well. We start with an architecture-independent lib/asm-offsets.c which generates include/generated/generic-asm-offsets.h (included by include/asm-offsets.h, which is what will be referred to in the actual source code). Later this may be extended by architecture-specific arch/*/lib/asm-offsets.c files that will generate a include/generated/asm-offsets.h. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Kumar Gala <galak@kernel.crashing.org>
* | Blackfin: bf527-ezkit-v2: move to boards.cfgMike Frysinger2010-10-25-8/+0
| | | | | | | | | | | | | | Now that the boards.cfg file supports options to mkconfig, we can move the bf527-ezkit-v2 target out of the Makefile and into boards.cfg. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | sh: sh4: Move to boards.cfgNobuhiro Iwamatsu2010-10-21-60/+0
| | | | | | | | | | | | | | Move the sh4 target boards out of the Makefile and into boards.cfg. And fix sh4 of MAKEALL. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: sh3: Move to boards.cfgNobuhiro Iwamatsu2010-10-21-14/+0
| | | | | | | | | | | | | | Move the sh3 target boards out of the Makefile and into boards.cfg. And fix sh3 of MAKEALL. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: rsk7203: Move to boards.cfgNobuhiro Iwamatsu2010-10-21-8/+0
|/ | | | | | | Move the rsk7203 target out of the Makefile and into boards.cfg. And fix sh2 of MAKEALL. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2010-10-20-18/+1
|\
| * Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASEEric Cooper2010-10-19-1/+1
| |
| * Build: PXA: Fix TrizepsIV build variantsMarek Vasut2010-10-19-8/+0
| | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * Build: PXA: Fix Vpac270 build variantsMarek Vasut2010-10-19-16/+0
| | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * PXA: Fix vpac270 OneNAND booterMarek Vasut2010-10-19-0/+2
| | | | | | | | | | | | NOTE: The modification in Makefile will be superseded by a pending patch! Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| * PXA: Voipac270 improvementsMarek Vasut2010-10-19-1/+6
| | | | | | | | | | | | | | | | | | | | 128MB NOR module support. Define __io to get harddrive working. Fix saving of environment into OneNAND. Boot from harddrive when possible. Add missing MAINTAINERS entry. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* | Makefile: allow boards to check file size limitsMike Frysinger2010-10-19-0/+17
|/ | | | | | | | | | | | | Boards often have a reserved size limit on the flash where they're stored. Sometimes during upgrades or config changes, those limits are exceeded, but no one notices until they try to upgrade and the limit screws things up. Either not enough of U-Boot is written to flash (and so the reboot fails), or too much is written (and so things after it get clobbered). So allow boards to declare a size limit (in bytes) and have the build system check it while building. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Makefile: move all Power Architecture boards into boards.cfgWolfgang Denk2010-10-18-1169/+0
| | | | | | | | | | Clean up Makefile, and drop a lot of the config.mk files on the way. We now also automatically pick all boards that are listed in boards.cfg (and with all configurations), so we can drop the redundant entries from MAKEALL to avoid building these twice. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Rename TEXT_BASE into CONFIG_SYS_TEXT_BASEWolfgang Denk2010-10-18-51/+51
| | | | | | | | | | | | The change is currently needed to be able to remove the board configuration scripting from the top level Makefile and replace it by a simple, table driven script. Moving this configuration setting into the "CONFIG_*" name space is also desirable because it is needed if we ever should move forward to a Kconfig driven configuration system. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Makefile: clean MatrixVision buildsWolfgang Denk2010-10-18-0/+1
| | | | | | | | | | | | "make clean" after builds of MatrixVision boards would leave stale files around: board/matrix_vision/mvblm7/bootscript.img board/matrix_vision/mvsmr/bootscript.img Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix define for MPC5121 ADS board.mark.vels@team-embedded.nl2010-10-13-1/+1
| | | | | | | | | | | | | | Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h expects a define CONFIG_MPC5121ADS_REV2 for this. Therefore there are two defines used but only 1 is defined. This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2 to have one common define. This patch fixes faulty mem size detection caused by wrong config in include/configs/mpc5121ads.h Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
* Merge branch 'next' of /home/wd/git/u-boot/nextWolfgang Denk2010-09-28-15/+15
|\ | | | | | | | | | | | | Conflicts: include/ppc4xx.h Signed-off-by: Wolfgang Denk <wd@denx.de>