summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* autoconf.mk.dep: use target cflags, not hostMike Frysinger2011-10-22-1/+1
| | | | | | | | | | The current autoconf.mk.dep rule uses the host cflags when executing the target compiler (which includes target header files). We don't want to mix the target compiler and host compiler flags, so change it to CFLAGS. Otherwise we get things like -pedantic which the U-Boot source code does not build with. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Makefile: Remove MLO on make cleanJoel A Fernandes2011-10-22-0/+1
| | | | | | | SPL builds could leave an MLO which is an mkimage of type omapimage Make sure its deleted on make clean/distclean Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
* examples: api: allow build with private libgccChe-liang Chiou2011-10-22-9/+13
| | | | | | | | | | | | | | | | | | | | | | The examples/api is not configured with USE_PRIVATE_LIBGCC. This makes building examples/api break on certain boards that do not/cannot use the public libgcc. Nevertheless, this patch has to also touch the top-level Makefile to fix this problem because the current top-level Makefile does not specify libgcc as a prerequisite of examples/api, and explicitly builds examples/api _before_ libgcc. For testing this patch, I added the following to configs/seaboard.h and ran demo.bin on a Seaboard. +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 +#define CONFIG_CMD_NET +#define CONFIG_NET_MULTI Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* ColdFire: Clean Makefile _config rulesstany MARCEL2011-10-19-2/+8
| | | | | | Remove unused mkdir, and add missing ones. Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
* ColdFire: Move boards with simple _config rules to boards.cfgstany MARCEL2011-10-19-96/+0
| | | | Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
* ColdFire: Merge differentiated linking files into a sigle one by boardstany MARCEL2011-10-19-9/+0
| | | | | | | | The spa, stm, int, 32 and 16 linking files are identical so there is no need to differentiate them. A single lds file is now used, and _config rule are simplified. Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
* Move timestamp and version files into 'generated' subdirSimon Glass2011-10-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a rather subtle build problem where the build time stamp is not updated for out-of-tree builds if there exists an in-tree build which has a valid timestamp file. So if you do an in-tree build, then an out-of-tree build your timestamp will not change. The correct timestamp_autogenerated.h lives in the object tree, but it is not always found there. The source still lives in the source tree and when compiling version.h, it includes timestamp_autogenerated.h. Since the current directory is always searched first, this will come from the source tree rather than the object tree if it exists there. This affects dependency generation also, which means that common/cmd_version.o will not even be rebuilt if you have ever done an in-tree build. A similar problem exists with the version file. This change moves both files into the 'generated' subdir, which is already used for asm-offsets.h. Then timestamp.h and version.h are updated to include the files from there. There are other places where these generated files are included, but I cannot see why these don't just use the timestamp.h and version.h headers. So this change also tidies that up. I have tested this with in- and out-of-tree builds, but not SPL. I have looked at various other options for fixing this, including sed on the dep files, -I- and -include flags to gcc, but I don't think they can be made to work. Comments welcome. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* sandbox: Makefile changes to build sandbox architectureSimon Glass2011-10-17-0/+8
| | | | | | | | | | | | | | At this point U-Boot will build and run on x86 under Linux. The idea is to define a new architecture called 'sandbox', alongside ARM and x86. This runs natively on Linux to suit the host machine. All hardware access is either omitted or emulated. The purpose of this system is to test the bulk of the non-hardware-specific U-Boot code. We can mock the SPI flash, GPIOs, UART and keyboard, then test that U-Boot behaves as we wish. Signed-off-by: Simon Glass <sjg@chromium.org>
* Adjust dependency rules to permit per-file flagsSimon Glass2011-10-17-1/+1
| | | | | | | | | | | | | | The dependency rules are currently done in a shell 'for' loop. This does not permit Makefile variables to adjust preprocessor flags as is done with normal compile flags, using the CFLAGS_path/file.o syntax. This change moves the dependency generation into the Makefile itself, and permits a CPPFLAGS_path/file.o to adjust preprocessor flags on a file or directory basis. The CPPFLAGS_... variable is also folded into CFLAGS during the build. Signed-off-by: Simon Glass <sjg@chromium.org>
* sandbox: Disable standalone/API supportSimon Glass2011-10-17-3/+6
| | | | | | | This is not useful on the sandbox architecture since we can simply link all our code with U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org>
* Safer timestamp_autogenerated.h generationLoïc Minier2011-10-06-2/+3
| | | | | | | | Generate timestamp_autogenerated.h as safely as version_autogenerated.h. Cc: patches@linaro.org Signed-off-by: Loïc Minier <loic.minier@linaro.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Build timestamp_autogenerated.h without configLoïc Minier2011-10-06-9/+10
| | | | | | | | | | | | | | Tools such as mkimage include version information but are config-agnostic; build timestamp_autogenerated.h even when config.mk isn't generated to fix "make tools" build failure: gcc [...] -o mkimage.o mkimage.c -c In file included from include/version.h:27:0, from mkimage.c:26: include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No such file or directory Cc: patches@linaro.org Signed-off-by: Loïc Minier <loic.minier@linaro.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Makefile: remove mx31pdk exceptionStefano Babic2011-10-05-10/+0
| | | | | | | | | An entry in the main Makefile for the mx31pdk board is not necessary, and the board is added to boards.cfg as all other targets. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Wolfgang Denk <wd@denx.de>
* Makefile: drop imx31_phycore from general MakefileStefano Babic2011-10-05-8/+0
| | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
* Makefile: remove tx25 exceptionStefano Babic2011-10-05-4/+0
| | | | | | | | | An entry in the main Makefile for the tx25 board is not necessary, and the board is added to boards.cfg as all other targets. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Wolfgang Denk <wd@denx.de>
* powerpc/mpc83xx: Migrate from spd_sdram to unified DDR driverYork Sun2011-09-29-0/+1
| | | | | | | | | | | | | | | | | Unified DDR driver is maintained for better performance, robustness and bug fixes. Upgrading to use unified DDR driver for MPC83xx takes advantage of overall improvement. It requires changes for board files to customize platform-dependent parameters. To utilize the unified DDR driver, a board needs to define CONFIG_FSL_DDRx in the header file. No more boards will be accepted without such definition. Note: the workaround for erratum DDR6 for the very old MPC834x Rev 1.0/1.1 and MPC8360 Rev 1.1/1.2 parts is not migrated to unified driver. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* powerpc/85xx: Add support for FMan ethernet in Independent modeKumar Gala2011-09-29-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Frame Manager (FMan) on QorIQ SoCs with DPAA (datapath acceleration architecture) is the ethernet contoller block. Normally it is utilized via Queue Manager (Qman) and Buffer Manager (Bman). However for boot usage the FMan supports a mode similar to QE or CPM ethernet collers called Independent mode. Additionally the FMan block supports multiple 1g and 10g interfaces as a single entity in the system rather than each controller being managed uniquely. This means we have to initialize all of Fman regardless of the number of interfaces we utilize. Different SoCs support different combinations of the number of FMan as well as the number of 1g & 10g interfaces support per Fman. We add support for the following SoCs: * P1023 - 1 Fman, 2x1g * P4080 - 2 Fman, each Fman has 4x1g and 1x10g * P204x/P3041/P5020 - 1 Fman, 5x1g, 1x10g Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Dai Haruki <dai.haruki@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Ioana Radulescu <ruxandra.radulescu@freescale.com> Signed-off-by: Lei Xu <B33228@freescale.com> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Shaohui Xie <b21989@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Prepare v2011.09v2011.09Wolfgang Denk2011-09-29-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2011.09-rc2v2011.09-rc2Wolfgang Denk2011-09-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2011.09v2011.09-rc1Wolfgang Denk2011-09-11-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Makefile : fix generation of cpu related asm-offsets.hStefano Babic2011-09-07-1/+19
| | | | | | | | | | | commit 0edf8b5b2fa0d210ebc4d6da0fd1aceeb7e44e47 breaks building on a different directory with the O= parameter. The patch wil fix this issue, generating always asm-offsets.h before the other targets. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Matthias Weisser <weisserm@arcor.de> CC: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-coldfireWolfgang Denk2011-09-04-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-coldfire: ColdFire:Clean up the CONFIG_STANDALONE_LOAD_ADDR usage ColdFire:Add mb for 5253 dram initialization ColdFire:Define the DM9000 byteswap for M5253 board. ColdFire:Update the env settings for several boards. ColdFire:disable the NFS define for 52277 board. ColdFire:Update the timer_init since it was unified. ColdFire: Cleanup for partial linking and --gc-sections ColdFire: Update compile flags for each CPUs ColdFire:Fix the configuration broken for some boards.
| * ColdFire:Fix the configuration broken for some boards.Jason Jin2011-09-04-0/+1
| | | | | | | | | | | | | | Some typoes in Makefile and boards.cfg make the M54455 board and M53017 board configuration broken. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
* | ARM: remove broken "netstar" boardWolfgang Denk2011-09-04-1/+0
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ARM: remove broken "edb93xx" boardsWolfgang Denk2011-09-04-10/+0
| | | | | | | | | | | | | | Remove edb9301, edb9302, edb9302a, edb9307, edb9307a, edb9312, edb9315 and edb9315a boards. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | integrator: convert to new build systemLinus Walleij2011-09-03-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deletes the integrator split_by_variant.sh script and defines a number of unique board types for the core modules that are meaningful to support for the Integrator AP/CP, i.e. the ones that did not just say "unsupported core module" in split_by_variant.sh. If more core modules need to be supported they are easy to add. We delete all the old cruft in Makefile and MAKEALL that was working around the old way of building boards. We create a unique config file per board to satisfy the build system, but they are just oneliners that include the existing integratorap.h and integratorcp.h configs. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* | atmel: Update support of board AT91SAM9M10G45-EK to new styleThomas Petazzoni2011-09-03-25/+0
| | | | | | | | | | | | Based on earlier work by Alex Waterman <awaterman@dawning.com>. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* | make pm9g45 buildable for v2011.06 releaseAsen Dimov2011-09-03-4/+0
| | | | | | | | | | | | | | Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de> changed at91_serial_hw_init to at91_seriald_hw_init
* | tny_a9260/tny_a9g20: update board to the new AT91 organizationThomas Petazzoni2011-09-03-10/+0
| | | | | | | | | | | | Cc: Albin Tonnerre <tonnerrealbin@gmail.com> CC: Gregory Hermant <gregory.hermant@calao-systems.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* | sbc35_a9g20: update board to the new AT91 organizationThomas Petazzoni2011-09-03-7/+0
|/ | | | | | | | | Cc: Albin Tonnerre <tonnerrealbin@gmail.com> Cc: Gregory Hermant <gregory.hermant@calao-systems.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de> Removed SBC35 from MAKEALL
* ARM: versatile: fix board supportStefano Babic2011-08-04-9/+0
| | | | | | | | | | | | | Versatile board is used as example to run u-boot under qemu. The patch fixes relocation for all versatile boards and adds a versatileqemu target to be used under qemu. Patch tested only under qemu, not on real boards. Tested with QEMU emulator version 0.14.50. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Alessandro Rubini <rubini-list@gnudd.com> CC: Loïc Minier <loic.minier@linaro.org>
* AT91: Makes AT91SAM9263-EK build correctly against u-boot-atmel/masterXu, Hong2011-08-03-19/+0
| | | | | | | | Rework for AT91SAM9263-EK, makes it build again. Based on the work for AT91SAM9260-EK. Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Reinhard Meyer <uboot@emk-elektronik.de>
* AT91: Board fix for AT91SAM9261-EKXu, Hong2011-08-03-23/+0
| | | | | | | Fix board part of AT91SAM9261-EK according to the new scheme Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* AT91: Makes AT91SAM9RL-EK build correctly against u-boot-atmel/masterXu, Hong2011-08-03-12/+0
| | | | | | | | | Rework for AT91SAM9RL-EK, makes it build again. Based on the work for AT91SAM9260-EK. V4: added changes to MAKEALL Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2011-08-02-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-blackfin: Blackfin: jtag-console: fix timer usage Blackfin: switch to common display_options() Blackfin: serial: move early debug strings into .rodata section Blackfin: adi boards: also set stderr to nc with helper Blackfin: update anomaly lists to latest public info Blackfin: serial: convert to bfin_{read,write} helpers Blackfin: split out async setup Blackfin: adi boards: enable pretty flash progress output Blackfin: drop unused dma.h header from start code Blackfin: portmux: allow header to be included in assembly files Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Blackfin: sync MMR read/write helpers with Linux Blackfin: gpio: optimize free path a little Blackfin: post: setup default CONFIG_SYS_POST_WORD_ADDR Blackfin: uart: fix printf warning Blackfin: add init.elf helper code Blackfin: dont reset SWRST on newer bf526 parts Blackfin: adi boards: enable multi serial support by default Blackfin: uart: add multiple serial support Blackfin: uart: move debug buffers into local bss
| * Blackfin: add init.elf helper codeMike Frysinger2011-07-12-1/+2
| | | | | | | | | | | | | | | | | | This creates a standalone ELF that executes just the Blackfin initcode. This is useful for people who want to program the low level aspects of the CPU (memory/clocks/etc...) and can easily be used with JTAG for quick booting while developing. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Correct ih_os for u-boot.imganeeshv2011-07-28-1/+1
| | | | | | | | | | | | | | Provide appropriate '-O u-boot' while doing mkimage for u-boot.img Signed-off-by: Aneesh V <aneesh@ti.com>
* | mkimage: add UBL header support for booting davinci cpusHeiko Schocher2011-07-28-0/+5
| | | | | | | | | | | | | | | | creating an u-boot.ubl file, which contains the UBL Header needed for booting from NAND with the RBL from TI. For more information read doc/README.ublimage. Signed-off-by: Heiko Schocher <hs@denx.de>
* | Let source cross-reference targets follow symbolic linksHorst Kronstorfer2011-07-28-3/+7
| | | | | | | | | | | | | | | | Tell 'find' to follow symbolic links, so that files under include/asm and arch/$(ARCH)/include/asm/arch are added to the indexing file list. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com> Acked-by: Detlev Zundel <dzu@denx.de>
* | 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>