summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://88.191.163.10/u-boot-armTom Rini2013-08-18-1/+1
|\ | | | | | | | | | | | | | | | | | | Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
| * Add additional MLO images to .gitignoreJustin Waters2013-07-30-1/+1
| | | | | | | | | | | | This rule catches images such as MLO.byteswap Signed-off-by: Justin Waters <justin.waters@timesys.com>
* | dts/Makefile: simplify dtc invocationStephen Warren2013-08-02-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | The invocation of dtc is significantly more complex that it could be, in order to work around an issue on old versions of dtc, which print a message to stdout every time they run. Remove this workaround, on the assumption that people have or will upgrade to a newer version of dtc. This simplifies the build rule significantly. Related, split the invocation of cpp and dtc into separate commands rather than a pipeline, so that if either fail, it is detected. This has the nice benefit of saving off the result of the pre-processing step, allowing it to be easily inspected. Assuming a new enough dtc (which an earlier patch enforces), dtc will parse #line directives in its input file, and generate correct file and line numbers in error messages, even though cpp is unconditionally applied to its input file. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
* Merge branch 'u-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-05-30-0/+6
|\ | | | | | | | | | | Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c
| * .gitignore: add GNU GLOBAL filesMasahiro Yamada2013-05-17-0/+6
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | arm: mxs: Preprocess u-boot.bd so they contain full pathMarek Vasut2013-05-06-0/+1
|/ | | | | | | | | | | | | | | | The u-boot-imx23.bd and u-boot-imx28.bd need to be preprocessed, otherwise they have issues with out-of-tree build where elftosb tool couldn't sometimes find the u-boot.bin and spl/u-boot-spl.bin . Preprocess these .bd files with sed and insert full path to u-boot.bin and spl/u-boot-spl.bin to prevent this issue. Moreover, to avoid adding more churn into main Makefile, move all this preprocessing and u-boot.sb generation into CPU directory instead. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
* imx: Add u-boot-with-nand-spl.imx make targetBenoît Thébaudeau2013-04-12-0/+1
| | | | | | | | | | | | | This image combines the SPL with the i.MX header, the FCB and U-Boot. For i.MX25/35/51, the FCB is ignored by the boot ROM, so this image is just useful because it can be programmed on a NAND Flash page boundary. For i.MX53, the FCB is required by the boot ROM. This does not support i.MX6 so far because its FCB is more complicated. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
* imx: Add u-boot-with-spl.imx make targetBenoît Thébaudeau2013-04-12-0/+1
| | | | | | | | | | This image combines the SPL with the i.MX header and U-Boot. This is a convenient way of having a single image to program on some boot devices. The i.MX header has to be added to the SPL before appending U-Boot, so that the boot ROM loads only the SPL. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
* .gitignore: Add /SPLBenoît Thébaudeau2013-04-12-0/+1
| | | | Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
* Refactor linker-generated arraysAlbert ARIBAUD2013-03-12-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Refactor linker-generated array code so that symbols which were previously linker-generated are now compiler- generated. This causes relocation records of type R_ARM_ABS32 to become R_ARM_RELATIVE, which makes code which uses LGA able to run before relocation as well as after. Note: this affects more than ARM targets, as linker- lists span possibly all target architectures, notably PowerPC. Conflicts: arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds arch/arm/cpu/armv7/omap-common/u-boot-spl.lds board/ait/cam_enc_4xx/u-boot-spl.lds board/davinci/da8xxevm/u-boot-spl-da850evm.lds board/davinci/da8xxevm/u-boot-spl-hawk.lds board/vpac270/u-boot-spl.lds Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
* imximage.cfg: run files through C preprocessorTroy Kisky2013-01-22-0/+1
| | | | | | | | | | | | The '#' used as comments in the files cause the preprocessor trouble, so change to /* */. The mkimage command which uses this preprocessor output was moved to arch/arm/imx-common/Makefile .gitignore was updated to ignore .cfgtmp files. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
* add include/u-boot.lst to .gitignoreLuka Perkov2012-12-06-1/+1
| | | | | | | u-boot.lst is located in include directory. Update .gitignore file accordingly. Signed-off-by: Luka Perkov <luka@openwrt.org>
* common: Add symbol handling for generic lists into MakefileMarek Vasut2012-10-22-0/+1
| | | | | | | | | | | | | | | | | | | | | | | This patch adds essential components for generation of the contents of the linker section that is used by the linker-generated array. All of the contents is held in a separate file, u-boot.lst, which is generated at runtime just before U-Boot is linked. The purpose of this code is to especially generate the appropriate boundary symbols around each subsection in the section carrying the linker-generated arrays. Obviously, the interim linker code for actual placement of the variables into the section is generated too. The generated file, u-boot.lst, is included into u-boot.lds via the linker INCLUDE directive in u-boot.lds . Adjustments are made in the Makefile and spl/Makefile so that the u-boot.lds and u-boot-spl.lds depend on their respective .lst files. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Tested-by: Joe Hershberger <joe.hershberger@ni.com>
* IPL: Remove remains of OneNAND IPLMarek Vasut2012-09-18-5/+0
| | | | | | | | | | | After removing the Apollon board, remove the OneNAND IPL too. There are no users for it any more. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Minkyu Kang <promsoft@gmail.com> Cc: Tom Rini <trini@ti.com> Acked-by: Minkyu Kang <mk7.kang@samsung.com>
* hawkboard/omapl-138: Add support for generating ais image for hawkboardSughosh Ganu2012-09-01-0/+3
| | | | | | | | | Parameters used for configuring certain SoC peripherals are parsed from the cfg file and appended as part of the ais image's header. The u-boot-spl.ais generated is flashed separately to the nand, so do not delete the file after generation of u-boot.ais. Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
* Build: Ignore build tree and IDE control fileTimo Ketola2012-08-09-0/+4
| | | | Signed-off-by: Timo Ketola <timo@exertus.fi>
* .gitignore: Add .su filesTom Rini2012-03-26-0/+1
| | | | | | | The '-fstack-usage' option to gcc will generate .su files, ignore them. Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Tom Rini <trini@ti.com>
* arm, davinci: Add support for generating AIS images to the MakefileChristian Riesch2011-12-24-0/+1
| | | | | | | Signed-off-by: Christian Riesch <christian.riesch@omicron.at> Cc: Stefano Babic <sbabic@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Mike Frysinger <vapier@gentoo.org>
* iMX28: Add u-boot.sb target to MakefileMarek Vasut2011-11-11-0/+1
| | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Detlev Zundel <dzu@denx.de>
* fdt: Add support for a separate device tree (CONFIG_OF_SEPARATE)Simon Glass2011-10-26-0/+1
| | | | | | | | | This adds support for an FDT to be build as a separate binary file called u-boot.dtb. This can be concatenated with the U-Boot binary to provide a device tree located at run-time by U-Boot. The Makefile is modified to provide this file in u-boot-dtb.bin. 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>
* Tell git to ignore asm-offsets.sLaurence Withers2011-10-06-2/+1
| | | | | | | | The generated file asm-offsets.s may be found at various depths in the arch subdirectories, so simply ignore it throughout the tree. Signed-off-by: Laurence Withers <lwithers@guralp.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* omap4_panda: Ignore omap4 SPL called MLOJoe Hershberger2011-09-30-0/+1
| | | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Sandeep Paulraj <s-paulraj@ti.com>
* ignore soc asm-offsets.sMike Frysinger2011-09-21-0/+1
| | | | | | | | Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of asm-offsets.s for SoC dirs, but missed adding it to the ignore list which makes it show up in `git status`. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* mkimage: add UBL header support for booting davinci cpusHeiko Schocher2011-07-28-0/+1
| | | | | | | | 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>
* .gitignore: update list of u-boot.* files and add *.binecc2011-05-22-3/+5
| | | | | | | This patch adds additional u-boot.* files mentioned in Makefile, and adds *.bin since these are deleted as part of "make clean". Signed-off-by: Eric Cooper <ecc@cmu.edu>
* .gitignore: ignore generated u-boot.imxStefano Babic2011-01-17-0/+1
| | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
* include/asm-offsets.h: automatically generate assembler constantsWolfgang Denk2010-10-26-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* .gitignore: ignore generated u-boot.ldsMike Frysinger2009-08-23-0/+1
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Add "tags" to .gitignore file.Po-Yu Chuang2009-07-21-0/+1
| | | | | Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* ignore .gdb_history filesMike Frysinger2008-12-05-0/+3
| | | | | | When using gdb, history files will often get generated. So ignore them. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* gitignore: add tags files and Vim swap fileMarkus Heidelberg2008-09-09-0/+5
| | | | Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
* Fix merge problemsStefan Roese2008-08-06-0/+7
| | | | Signed-off-by: Stefan Roese <sr@denx.de>
* gitignore: udpate stgit generated and .patch fileJean-Christophe PLAGNIOL-VILLARD2008-04-18-0/+2
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-blackfinWolfgang Denk2008-02-15-0/+4
|\ | | | | | | | | | | | | | | | | Conflicts: Makefile doc/README.standalone Signed-off-by: Wolfgang Denk <wd@denx.de>
| * generate u-boot.ldr for Blackfin targetsMike Frysinger2008-02-04-0/+4
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Add *~ to .gitignoreNiklaus Giger2008-02-14-0/+1
|/ | | | | | One should never add a backup file ending in with ~ to the git repository. Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
* Add missing file in gitignore and commentsJean-Christophe PLAGNIOL-VILLARD2008-01-09-2/+30
| | | | | | based on Linux source tree's .gitignore files Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Add .gitignore filesGrant Likely2007-11-15-0/+13
Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>