summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/efi'Sascha Hauer2014-08-071-1/+1
|\ | | | | | | | | | | | | Conflicts: .gitignore Makefile drivers/serial/Makefile
| * Add initial EFI architecture supportSascha Hauer2014-07-161-1/+2
| | | | | | | | | | | | | | This adds support for running barebox in an EFI environment on X86 PC hardware. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/doc'Sascha Hauer2014-08-071-5/+1
|\ \ | | | | | | | | | | | | Conflicts: Makefile
| * | Makefile: clean barebox.zynqAntony Pavlov2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | treewide: drop Doxygen stuffAntony Pavlov2014-07-281-5/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Doxygen documentation is removed in the commit commit 98360be0fefd58bf27df03c47d887dd676a31d73 Author: Sascha Hauer <s.hauer@pengutronix.de> Date: Tue Jun 17 10:27:03 2014 +0200 Documentation: remove doxygen documentation Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/canon'Sascha Hauer2014-08-071-1/+2
|\ \
| * | ARM: add Canon A1100 ROM image generationAntony Pavlov2014-08-011-1/+2
| |/ | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / Release v2014.08.0v2014.08.0Sascha Hauer2014-08-041-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/doc'Sascha Hauer2014-07-041-12/+9
|\
| * Makefile: Add missing closing quote for "make help"Robert P. J. Day2014-07-021-1/+1
| | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * Documentation: Add new sphinxs docsSascha Hauer2014-06-261-2/+9
| | | | | | | | | | | | | | | | | | | | This is a rewrite of the Documentation in reStructuredText format using Sphinx as build system, see http://sphinx-doc.org/. The documentation is built into static html pages with 'make docs'. The pages can be found under Documentation/html after building. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * Documentation: remove doxygen documentationSascha Hauer2014-06-261-10/+0
| | | | | | | | | | | | | | The doxygen documentation is long outdated. Remove it. It will be replaced with sphinx based documentation later. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Release v2014.07.0v2014.07.0Sascha Hauer2014-07-041-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2014.06.0v2014.06.0Sascha Hauer2014-06-041-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/dts'Sascha Hauer2014-05-051-1/+1
|\
| * dts: Use dt-bindings from kernelSascha Hauer2014-04-281-1/+1
| | | | | | | | | | | | | | | | barebox used to have its own include/dt-bindings with files copied from the corresponding kernel files. Use upstream dt-bindings directly instead. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Release v2014.05.0v2014.05.0Sascha Hauer2014-05-051-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2014.04.0v2014.04.0Sascha Hauer2014-04-041-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/env'Sascha Hauer2014-03-071-1/+19
|\
| * defaultenv: Allow multiple defaultenvironment overlaysSascha Hauer2014-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | We can compile barebox for multiple boards at once, but currently they all share a single default environment. This patch adds a defaultenv_append() which boards can call to customize the default environment during runtime. Each board now generate default environment snippets using bbenv-y and add them during runtime with defaultenv_append() Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * make: Add bbenv-y target to generate default environment filesSascha Hauer2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a target to generate environment files from directories. These are compiled into the barebox binary. use it as: bbenv-$(CONFIG_SOMETHING) += my-environment The directory containing the files to compile into the binary should be named my-environment. This can be accessed in C code later as: extern unsigned char __bbenv_my_environment_start[]; extern unsigned char __bbenv_my_environment_end[]; Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * Kconfig: Select default compression typeSascha Hauer2014-02-191-0/+17
| | | | | | | | | | | | | | | | | | | | Instead of asking explicitly for the default environment compression type ask for the in-barebox default compression type. This also adds a DEFAULT_COMPRESSION_SUFFIX make variable which can be used together with the wildcard rules for compressed files to generate compressed files without explicitly support each compression type. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Release v2014.03.0v2014.03.0Sascha Hauer2014-03-071-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2014.02.0v2014.02.0Sascha Hauer2014-02-031-2/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2014.01.0v2014.01.0Sascha Hauer2014-01-071-3/+3
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Makefile: fix endless make when 'make barebox.s'Du Huanpeng2013-12-191-2/+2
| | | | | | | | add the same target barebox.s (with a lowercase 's') to make both work with barebox.S and barebox.s. Signed-off-by: Du Huanpeng <u74147@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2013.12.0v2013.12.0Sascha Hauer2013-12-061-2/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2013.11.0v2013.11.0Sascha Hauer2013-11-071-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2013.10.0v2013.10.0Sascha Hauer2013-10-071-2/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/misc'Sascha Hauer2013-09-051-3/+3
|\
| * small tweeks to build system for compatibility on MacOS XDarren Garnier2013-09-031-3/+3
| | | | | | | | | | Signed-off-by: Darren Garnier <dgarnier@reinrag.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Release v2013.09.0v2013.09.0Sascha Hauer2013-09-041-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Release v2013.08.0v2013.08.0Sascha Hauer2013-08-051-2/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/multi-image'Sascha Hauer2013-07-011-0/+10
|\
| * Add multi images supportSascha Hauer2013-07-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the make infrastructure to build multiple SoC or board specific images from a single barebox binary. The basic idea is that we no longer have a single pbl, but instead multiple pbls, one per image if necessary. Each pbl is defined by its entry function so that each pbl can do exactly what a given board needs. Additionally the pbls together with a self extracting barebox binary can be encapsulated in specific image formats. squashed in build fixes from Lucas Stach for make version >= 3.82: Split Multimage Makefile rule in explicit and implicit parts Fixes build with make version >=3.82 Frome the make 3.82 NEWS file: * WARNING: Backward-incompatibility! In previous versions of make it was acceptable to list one or more explicit targets followed by one or more pattern targets in the same rule and it worked "as expected". However, this was not documented as acceptable and if you listed any explicit targets AFTER the pattern targets, the entire rule would be mis-parsed. This release removes this ability completely: make will generate an error message if you mix explicit and pattern targets in the same rule. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Lucas Stach <dev@lynxeye.de>
* | Merge branch 'for-next/misc'Sascha Hauer2013-07-011-1/+1
|\ \
| * | Makefile: make silent module build more silentSascha Hauer2013-06-211-1/+1
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / Release v2013.07.0v2013.07.0Sascha Hauer2013-07-011-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/marvell'Sascha Hauer2013-06-021-1/+1
|\ | | | | | | | | Conflicts: arch/arm/Makefile
| * arm: integrate kwbimage in the image generationThomas Petazzoni2013-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a ARCH_MVEBU platform is selected, generate barebox.kwb and barebox.kwbuart images from barebox.bin, using kwbimage. barebox.kwb is generated by executing kwbimage on the board kwbimage.cfg file, and is therefore designed to be booted from the default boot media of the board, as defined by kwbimage.cfg (typically a NAND flash or SPI flash). barebox.kwbuart is generated by executing kwbimage on the board kwbimage.cfg file, but by overriding the boot media to be UART. This image is suitable for usage with the kwbtool and is generally useful for recovery purposes. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Squashed this fixup: arm: ensure the build doesn't fail when kwbimage lacks the binary blob mach-mvebu images for Armada 370 and Armada XP SoC require a DDR3 training code which should be extracted from existing bootable images for the relevant board. When such binary blob has not been extracted, the build of the .kwb and .kwbuart images will fail. This is annoying as it makes the build of all Armada 370/XP defconfig fail, which can be a problem for automated builds. This proposal makes the failure of kwbimage not a fatal failure for the build process, and shows a warning. The user therefore sees: ==================================================================== KWB barebox.kwb Didn't find the file 'plathome-openblocks-ax3-binary.0' in '/home/thomas/projets/barebox' which is mandatory to generate the image This file generally contains the DDR3 training code, and should be extracted from an existing bootable image for your board. See 'kwbimage -x' to extract it from an existing image. Could not create image WARNING: Couldn't create KWB image due to previous errors. KWBUART barebox.kwbuart Didn't find the file 'plathome-openblocks-ax3-binary.0' in '/home/thomas/projets/barebox' which is mandatory to generate the image This file generally contains the DDR3 training code, and should be extracted from an existing bootable image for your board. See 'kwbimage -x' to extract it from an existing image. Could not create image WARNING Couldn't create KWB image due to previous errors. ==================================================================== The only drawback is that barebox-flash-image, which normally points to barebox.kwb, becomes a stale symbolic link. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Release v2013.06.0v2013.06.0Sascha Hauer2013-06-021-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/remove-config-h'Sascha Hauer2013-05-061-6/+12
|\
| * Makefile: Create empty <config.h> if this header file is not needed by boardAlexander Shiyan2013-04-091-6/+12
| | | | | | | | | | | | | | | | Patch creates empty <config.h> if this header is not needed by board. This will allow to remove many empty config.h files from boards. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2013-05-061-3/+0
|\ \
| * | Makefile: drop duplicate definition of cmd_objcopyJan Luebbe2013-04-191-3/+0
| |/ | | | | | | | | | | | | | | This command is already defined in scripts/Makefile.lib, which is included from Makefile. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / Release v2013.05.0v2013.05.0Sascha Hauer2013-05-061-1/+1
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/oftree'Sascha Hauer2013-04-041-1/+1
|\
| * ARM: Initial dts supportSascha Hauer2013-03-121-1/+1
| | | | | | | | | | | | | | | | - Add rules to generate dtb files in arch/arm/dts/ - add an initcall which unflattens and probes the internal devicetree - Add skeleton devicetree Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2013-04-041-59/+2
|\ \
| * | Make: update setlocalversion from the kernelSascha Hauer2013-03-091-59/+2
| |/ | | | | | | | | | | | | | | | | | | This syncs the localversion generation with the kernel. At least one effect is that a barebox built from a tar archive no longer marks itself as dirty. Also it moves some stuff from a scary Makefile to a not-so-scary shell script. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>