summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* 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>
| * unify toplevel tools targetsMike Frysinger2010-09-19-12/+11
| | | | | | | | | | | | | | | | | | | | | | Most tool subdirs do not rely on a configured tree, so move those targets out of the config checks and unify them in the process. Also add an easylogo target so people can easily build that. Also add these new tool targets to the 'tools-all' target. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Makefile: restore support for board shortcut targetsMike Frysinger2010-09-19-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that. When cleaning things up, the top level gitignore file ignores all things that end with ".depend", but the clean target only deletes files that are named exactly ".depend". Keep these in sync by having the clean target punt all files that match the pattern that gitignore is using. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Detlev Zundel <dzu@denx.de>
* | Prepare v2010.09v2010.09Wolfgang Denk2010-09-28-1/+1
|/ | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2010.09-rc2v2010.09-rc2Wolfgang Denk2010-09-19-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2010.09-rc1v2010.09-rc1Wolfgang Denk2010-09-10-2/+2
| | | | | | Coding style cleanup. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'at91' of git://git.denx.de/u-boot-atmelWolfgang Denk2010-09-08-1/+1
|\
| * cpuat91: convert to new at91 soc architectureEric Bénard2010-08-20-1/+1
| | | | | | | | | | | | | | | | | | convert the board to the new soc architecture update default config i2c upgrade taken from eb_cpux9k2.h & board/BuS/eb_cpux9k2/cpux9k2.c Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-samsungWolfgang Denk2010-09-08-0/+7
|\ \ | |/ |/|
| * ARMV7: S5P: make s5p-common for sharing the code between s5pc1xx and s5pc2xxMinkyu Kang2010-08-23-0/+7
| | | | | | | | | | | | | | | | This patch adds basic support for s5pc210. s5p-common will be used by all of s5p SoCs. Signed-off-by: Minkyu Kang <mk7.kang@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | powerpc/p2020ds: Integrated with P2020DS DDR change and enabled hwconfigyork2010-07-26-0/+1
|/ | | | | | | | Enabled SPD Enabled DDR2 Enabled hwconfig Signed-off-by: York Sun <yorksun@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2010-07-16-0/+1
|\
| * fdt: move fsl specific code from common fdt area to mpc8xxx/fdt.cKim Phillips2010-07-16-0/+1
| | | | | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-pxaWolfgang Denk2010-07-15-0/+9
|\ \
| * | PXA: Voipac PXA270 SupportMarek Vasut2010-07-14-0/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Voipac PXA270 board. The support includes: - Ethernet - USB - MMC - NOR Booting - OneNAND Booting - LCD - HDD Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Scott Wood <scottwood@freescale.com>
* | Merge branch 'master' of ../masterWolfgang Denk2010-07-15-1/+0
|\ \ | |/
| * Blackfin: drop old u-boot.lds clean targetMike Frysinger2010-07-13-1/+0
| | | | | | | | | | | | | | The u-boot.lds CPP unification missed the Blackfin-specific clean target. It is no longer needed, so punt it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | ARMV7: Add basic support for TI OMAP4Steve Sakoman2010-07-05-0/+7
|/ | | | | | | | | This patch adds minimum support for OMAP4. Code which can be shared between OMAP3 and OMAP4 is placed in arch/arm/cpu/armv7/omap-common Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* Merge branch 'master' into nextWolfgang Denk2010-06-30-1/+1
|\
| * Prepare 2010.06v2010.06Wolfgang Denk2010-06-29-1/+1
| | | | | | | | | | | | Update CHANGELOG Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-sh into nextWolfgang Denk2010-06-29-1/+2
|\ \
| * | sh: Fix build on the targetNobuhiro Iwamatsu2010-06-28-1/+2
| |/ | | | | | | | | | | | | SH fails building on the target. This supports this. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge branch 'master' into nextWolfgang Denk2010-06-23-4/+4
|\ \ | |/
| * Prepare v2010.06-rc3v2010.06-rc3Wolfgang Denk2010-06-23-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Makefile: always call date with LC_ALL=C setIlya Yanok2010-06-22-3/+3
| | | | | | | | | | | | | | | | | | | | | | Ensure that date is called only with LC_ALL=C locale set to make dates locale neutral thus preventing lurking of non-ASCII characters into U-Boot binary. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Changed LANG= into LC_ALL= as suggested by Mike Frysinger <vapier@gentoo.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' into nextWolfgang Denk2010-06-18-13/+6
|\ \ | |/ | | | | | | | | | | Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk2010-06-17-0/+3
| |\
| | * Add support for the LaCie ED Mini V2 boardAlbert Aribaud2010-06-17-0/+3
| | | | | | | | | | | | | | | | | | | | | This patch adds support for the LaCie ED Mini V2 product which is based on the Marvell Orion5x SoC. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
| * | Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk2010-06-17-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CONFLICT (rename/add): Rename board/davinci/da830evm/Makefile->board/ti/tnetv107xevm/Makefile in 89b765c7f6ddfde07ba673dd4adbeb5da391a81b. board/ti/tnetv107xevm/Makefile added in HEAD But files were identical, so no problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
generated by cgit v1.1 at 2024-11-11 22:58:40 +0000