Commit Graph

61 Commits

Author SHA1 Message Date
Fabio Porcedda
1586ce3a3d apply-patches.sh: Use the "APPLY_PATCHES" variable to call the script
To easy up adding optional parameters when calling the
"apply-patches.sh" add and use the "APPLY_PATCHES" variable to execute
the script.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-25 01:31:32 +02:00
Thomas De Schampheleire
f268f7131b .mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.

This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.

Alignment of line continuation characters (\) is kept as-is.

The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'

Brief explanation of this command:
    ^\([A-Z0-9a-z_]\+\)     a regular variable at the beginning of the line
    \([?:+]\?=\)            any assignment character =, :=, ?=, +=
    \([^\\]\+\)             any string not containing a line continuation
    \([^\\ \t]\+\s*\\\)     string, optional whitespace, followed by a
                            line continuation character
    \(\s*\\\)               optional whitespace, followed by a line
                            continuation character

Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.

This expression was tested on following test text: (initial tab not
included)

	FOO     = spaces before
	FOO     =   spaces before and after
	FOO	= tab before
	FOO	  = tab and spaces before
	FOO =	tab after
	FOO =	   tab and spaces after
	FOO =   	spaces and tab after
	FOO =    \
	FOO = bar \
	FOO = bar space    \
	FOO   =		   \
	GENIMAGE_DEPENDENCIES   = host-pkgconf libconfuse
	FOO     += spaces before
	FOO     ?=   spaces before and after
	FOO     :=
	FOO     =
	FOO	=
	FOO	  =
	FOO =
	   $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
	AT91BOOTSTRAP3_DEFCONFIG = \
	AXEL_DISABLE_I18N=--i18n=0

After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
  expression leaves the number of whitespace between the value and line
  continuation character intact, but the whitespace before that could have
  changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
  actually makes the code more readable.

Finally, the end result was manually reviewed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 15:00:28 +02:00
Gustavo Zacarias
4c29280557 uboot: bump to version 2014.07
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-16 20:39:40 +02:00
Peter Korsgaard
cb9aac7539 u-boot: use spl/u-boot-spl.bin as default spl file
Ever since u-boot introduced the generic spl support in u-boot 2012.10, the
default spl output file has been spl/u-boot-spl.bin and not u-boot-spl.bin,
so use that as a more sane default value.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-29 23:16:32 +02:00
Thomas Petazzoni
1ed01c9aaa uboot: check various configuration parameters and bail out if empty
Following the issues reported by Jerry <g4@novadsp.com>, it appears
that there are a number of U-Boot configuration variables we are not
checking properly, leaving users with weird behavior at build time.

This commit extends the existing U-Boot checks to verify that when a
custom version, custom tarball, or custom Git or Mercurial
repositories are selected, the appropriate fields are not empty in the
configuration.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-20 23:51:37 +02:00
Alexey Brodkin
eda1dc683f uboot: bump to version 2014.04
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>

Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-26 11:27:06 +02:00
Peter Korsgaard
2e628372d3 uboot: unbreak legal info for legacy versions
Fixes #6986

Prior to u-boot 2013.10, the GPL license text was stored in COPYING and not
Licenses/gpl-2.0.txt, breaking legal-info.

Work around it by simply copying the file from the old location to the new
if present.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-25 07:18:15 +01:00
Peter Korsgaard
a920fdd007 uboot: mark custom network settings as deprecated
As discussed on the the mailing list.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-18 09:04:31 +01:00
Gustavo Zacarias
eb9b1f5028 uboot: bump to version 2014.01
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-21 15:38:40 +01:00
Simon Dawson
f3fbfc52eb uboot: support -r option for mkenvimage
Some boards are configured in u-boot to store multiple redundant copies of
the environment image in flash.  For these boards, it is required to pass
the -r flag, when generating a boot environment image using mkenvimage.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-12 23:20:35 +01:00
Thomas De Schampheleire
bed4e27868 Config.in files: whitespace cleanup
This patch fixes the following whitespace problems in Config.in files:
- trailing whitespace
- spaces instead of tabs for indentation
- help text not indented with tab + 2 spaces

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 22:19:30 +01:00
Thomas De Schampheleire
4bff614528 linux/uboot: line-up repository-related configuration options
Although the configuration options for custom repository locations and
versions are very similar between the linux and uboot packages, there are
some minor differences. This patch lines up both packages.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-27 08:09:01 +01:00
Thomas De Schampheleire
f2c2193b05 u-boot: add support for custom Mercurial repository
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-27 08:08:47 +01:00
Thomas De Schampheleire
fbc2494a41 Remove redundant dollar signs in Config.in files
Some Config.in(.host) files have constructs like:

config FOO_VERSION
	string
	default "1.0" if FOO_1_0
	default "2.0" if FOO_2_0
	default $FOO_CUSTOM_VERSION if FOO_CUSTOM

The dollar sign here is not needed and confusing, so can be removed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 19:58:30 +02:00
Gustavo Zacarias
99002dc7b1 u-boot: bump to version 2013.10
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-22 10:39:28 +02:00
Peter Korsgaard
b8326cb643 u-boot: add option for Freescale u-boot.imx format
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-26 16:41:25 +02:00
Gustavo Zacarias
5adb0f46a2 u-boot: remove stale patches and bump to 2013.07
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-07-31 18:00:26 +02:00
Gary Coulbourne
51fc2776b7 uboot: add support for Freescale .sb format to uboot
[Thomas: update to recent Buildroot, add missing dependency on
host-elftosb.]

Signed-off-by: Gary Coulbourne <bear@bears.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-07-29 21:06:30 +02:00
Thomas De Schampheleire
ab25903bd7 u-boot: support custom u-boot.bin name
On some platforms, the standard U-Boot binary is not called u-boot.bin,
but u-boot<something>.bin. This is for example the case on the
Cavium-provided u-boot, where the output file is called
u-boot_<boardname>.bin.

This patch adds a 'custom format' choice in the existing u-boot binary
format selection, where this name can be put. In the Cavium example, this
option could be set to:
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-$(BR2_TARGET_UBOOT_BOARDNAME).bin"

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-07-26 21:18:23 +02:00
Spenser Gilliland
4d27205ab1 uboot: Add ELF target
adds ELF image option to uboot

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-15 23:24:09 +02:00
Jerzy Grzegorek
086f333f39 Normalize separator size to 80
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-07 10:54:54 +02:00
Jerzy Grzegorek
f9e76bb253 Convert headers to lower case when relevant
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-07 10:54:12 +02:00
Alexandre Belloni
702704014d Fix package headers to comply with coding style
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 17:26:35 +02:00
Fabio Porcedda
0a93b81487 uboot: add custom version option
Add custom version option as used in the linux kernel and barebox.
This way we can easily specify newer and older version.
Remove the list of the older versions because is obsoleted
by the new custom version option that is more flexible.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-07 09:26:04 +02:00
Peter Korsgaard
3510d8b4af u-boot: add 2013.04, deprecate 2011.12 / 2012.04, drop 2011.06 / 2011.09
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-24 09:14:53 +02:00
Peter Korsgaard
964f36fe06 uboot: simplify patch wildcard for BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
To match the logic we have for BR2_LINUX_KERNEL_PATCH. The user has
already specified a custom patch directory, so we don't need to be
so specific about the what file names we accept, and it becomes quite
cumbersome when a custom git version is used.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-11 07:47:54 +02:00
Arnaud Rébillout
7b25291940 uboot: integrate mkenvimage
This commit provides configuration options to automatically generate a
binary environment image for U-Boot.
Two options are available (and mandatory):
 * the location of a text file describing U-Boot environment.
 * the size of the environment.

[Peter: fix Config.in indentation + typo]
Signed-off-by: Arnaud Rébillout <rebillout@syscom.ch>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 20:49:15 +01:00
Peter Korsgaard
ea6f3bd9f2 u-boot: bump 2013.01.x version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-03 15:29:14 +01:00
Gustavo Zacarias
4cd111e0df u-boot: add 2013.01
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-18 12:44:05 +01:00
Arnout Vandecappelle (Essensium/Mind)
579fea2273 linux, uboot, mxs-bootlets, barebox: avoid double slash in CUSTOM_TARBALL
Closes #5846

The $(dir ...) function leaves a slash at the end, so that the LINUX_SITE
variable for a custom tarball ends in a slash. The DOWNLOAD macro adds
another slash between SITE and SOURCE, which results in a double slash in
the download URL.

Fix this by stripping off the final slash from the _SITE in all packages that
have a custom tarball.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-13 20:39:47 +01:00
Alexandre Belloni
a1504a791c u-boot: update at91 patches to match mainline
The patch that was included in buildroot was not the same as the final
one submitted in the mainline.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-02 21:27:18 +01:00
Peter Korsgaard
501ba89958 u-boot: add 2012.10, deprecate 2011.09, remove 2011.03
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-15 23:04:06 +02:00
Arnout Vandecappelle
b189c516d4 uboot: improve help text of BR2_TARGET_UBOOT_BOARDNAME
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-20 22:27:14 +02:00
Gustavo Zacarias
47a7a2771a u-boot: add version 2012.07
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-20 22:26:46 +02:00
Peter Korsgaard
32a0454d3c Merge branch 'next'
Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-03 21:59:03 +02:00
Simon Dawson
69d9ff2fb6 uboot: add license information
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-21 12:09:25 +02:00
Vivien Didelot
80b43964d0 u-boot: add AIS target format
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-11 20:23:36 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Luca Ceresoli
7212479492 u-boot: build signed image for OMAP processors
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-19 22:33:48 +02:00
Nicolas Dechesne
81302ba685 uboot: add a new binary format for u-boot.img
For some platforms like OMAP, a new binary format is now being used
for u-boot: u-boot.img. It is basically u-boot.bin which has been
processed with mkimage.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-05 23:50:24 +02:00
Nicolas Dechesne
7c79537cff uboot: Add support for U-Boot SPL
SPL is a first stage bootloader. On pandaboard it supercedes x-loader,
and should now be used.

This patch ensures that either SPL or xloader can be selected.

A config variable has been added for the name of the SPL binary generated
during u-boot build. For most platform it is u-boot-spl.bin but not always.
It is MLO on OMAP for example.

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-05 23:48:01 +02:00
Gustavo Zacarias
d8ff5d2990 u-boot: bump to 2012.04.01 release
Bump from 2012.04 to 2012.04.01
Fixes a nasty bug in the command line processing.

[Peter: keep kconfig name]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-29 11:02:50 +02:00
Gustavo Zacarias
b3610f87a6 u-boot: add 2012.04 release
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2012-04-24 15:28:40 +02:00
Peter Korsgaard
88404d6b80 u-boot: only apply 2011.12 at91 patch if building 2011.12
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-02 16:07:02 +01:00
Alexandre Belloni
a82b3262b2 configs: at91sam926* use latest u-boot and mainline linux
While upgrading the configs, it proved necessary to make more space on
the dataflash for u-boot since it grew because of relocation.

dataflash is then repartitionned to make more room for u-boot and a redundant
environment.

Signed-off-by: Alexandre Belloni <alexandre.belloni@piout.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-01 23:46:48 +01:00
Peter Korsgaard
0c5f68a4d3 u-boot: remove 2010.x versions, deprecate 2011.03 / 2011.06
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-02 17:00:34 +01:00
Gustavo Zacarias
7f63d39eeb u-boot: add version 2011.12
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-02 15:56:37 +01:00
Gustavo Zacarias
a03182ad02 u-boot: add support for u-boot-nand.bin
Add support for the u-boot-nand.bin target file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-12-01 16:50:05 +01:00
Gustavo Zacarias
0239612fb2 u-boot: add version 2011.09
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-12-01 16:50:03 +01:00
Peter Korsgaard
376a535fb3 u-boot: fix CUSTOM_PATCH_DIR documentation
We're using uboot-<version>-*.patch, and not u-boot-<version>-*.patch

Reported-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-19 19:56:50 +01:00