Commit Graph

41 Commits

Author SHA1 Message Date
Yann E. MORIN
06d126fdc1 boot/barebox: check for config file before calling kconfig-package
If we check that the user provides a config file after we call to the
kconfig-package infra, the error message we get is the one for the
kconfig-package infra, not the custom error message we want to show to
the user.

So, only call kconfig-package after we do the check.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-14 10:30:42 +02:00
Floris Bos
7241aee4ed barebox: add option to specify config fragments
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-05-21 23:50:49 +02:00
Peter Korsgaard
8721c03a7f barebox: unbreak custom patch handling after 0eba4759 (packages: apply custom patches using *.patch instead of <pkg>-*.patch)
The commit accidently dropped the continuation character (\), breaking the logic.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-04 14:33:18 +02:00
Yann E. MORIN
c778942dbd boot/barebox: do not check hash for custom versions
As we recently did for U-Boot, disable checking hashes for custom
versions of barebox.

Note that we currently have no hash file for barebox, but avoiding the
check will already be in place when we do add it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-05-02 15:11:01 +02:00
Thomas Petazzoni
fa6289bb1a packages: refactor checks using BR_BUILDING
Instead of manually testing MAKECMDGOALS, use the newly introduced
BR_BUILDING variable to know if we're building or not.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2015-04-26 21:43:25 +02:00
Thomas Petazzoni
0eba4759fa packages: apply custom patches using *.patch instead of <pkg>-*.patch
Several packages have some logic to apply custom patches that existed
before the BR2_GLOBAL_PATCH_DIR mechanism: at91bootstrap,
at91bootstrap3, barebox, uboot and linux. Currently, the logic of
those packages to apply custom patches is to match
<package-name>-*.patch, which is not consistent with what we've done
for patches stored in the package directory, and for patches stored in
BR2_GLOBAL_PATCH_DIR: in such cases, we simply apply *.patch.

Therefore, for consistency reasons, this commit changes these packages
to also apply *.patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2015-04-06 11:04:59 +02:00
Lahoudere Fabien
f31f411883 barebox: fix compilation on x86-64 architecture
Barebox uses KERNEL_ARCH to derive BAREBOX_ARCH, but doesn't
currently handle the case of the x86-64 architecture. In this
case KERNEL_ARCH is x86_64, but BAREBOX_ARCH should be x86
nonetheless.

Signed-off-by: Fabien Lahoudere <fabienlahoudere.pro@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-04 21:38:45 +01:00
Thomas De Schampheleire
357a2c2715 barebox: migrate to the kconfig infrastructure
[Thomas:
 - use $(BAREBOX_DIR) instead of $(@D) when defining
   BAREBOX_SOURCE_CONFIG, because $(@D) has no value at this point
   since we're outside of a make rule. This was causing Barebox to be
   constantly rebuilt, since the defconfig path was not a full path,
   it was looking like: '/arch/arm/configs/tegra_v7_defconfig'. The
   solution of using $(BAREBOX_DIR) has been used to mimic was is done
   in the linux package, which uses $(LINUX_DIR).]

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: "Yann E. Morin" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-14 17:29:41 +01:00
Thomas De Schampheleire
6cd04c3139 barebox: qstrip the path to the custom configuration file
Even though this is not strictly necessary with the current version
of barebox.mk, it becomes necessary when migrating barebox.mk to the
kconfig infrastructure.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: "Yann E. Morin" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-02-14 17:04:04 +01:00
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
Jerzy Grzegorek
c7f4b96471 package: remove the trailing slash sign from <PKG>_SITE variable
Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk:

$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))

so it is redundant.
This patch removes it from $(PKG)_SITE variable for BR consistency.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 23:17:46 +02:00
Fabio Porcedda
21413e3540 barebox: fix coding style
As stated in the buildroot user manual add just a single space before
and after a '=' sign.
Break long lines.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-27 23:27:22 +01: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
Maxime Ripard
18b04970a2 barebox: Allow to build an environment image
[Peter: Tweaked help text]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-28 23:15:53 +01:00
Fabio Porcedda
3fd048a99a barebox: needs host-lzop
Add host-lzop dependency.
Use $(TARGET_MAKE_ENV) when calling $(MAKE)
to able to use binaries built for host.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-13 21:12:21 +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
Gregory Hermant
62b13aea1d barebox: use the symlink to copy the barebox binary to the images directory
Barebox creates a symlink to the binary. This symlink points to
the barebox.bin or to the compressed zbarebox.bin binary.

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Tested-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Tested-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-10 21:56:54 +01:00
Maxime Ripard
1e9b963255 barebox: Allow to pass a custom configuration file
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-03 17:20:15 +01:00
Simon Dawson
805ba041c0 barebox: fix license information
The barebox license should be "GPLv2 with exceptions", and not GPLv2.

Signed-off-by: Simon Dawson <simond@trainfx.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-09 11:38:55 +02:00
Simon Dawson
73b18d9970 barebox: fix license information
The barebox license is GPLv2, and not GPLv2+.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-22 19:47:18 +02:00
Simon Dawson
de2ac17e46 barebox: 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:16 +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
Thomas Petazzoni
0849e8193e package: remove useless arguments from GENTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:09:58 +02:00
Peter Korsgaard
dcb43a0eb0 barebox: patch-kernel.sh is no more
Thanks to Sven Neumann for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-19 10:13:37 +02:00
Jean-Christophe PLAGNIOL-VILLARD
661c18bffd barebox: add support for custom version, tarball, git and patch dir
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-18 22:06:51 +02:00
Peter Korsgaard
3e4d029219 barebox: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-13 08:54:39 +02:00
Jean-Christophe PLAGNIOL-VILLARD
83f1bf9e45 barebox: add barebox-<n/x/menu>config and barebox-savedefconfig support
[Peter: only activate if barebox is enabled, fix deps]
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-24 14:43:56 +02:00
Jean-Christophe PLAGNIOL-VILLARD
ac7d781f7c barebox: bump version
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-08-09 20:11:11 +02:00
Peter Korsgaard
33c4e77c2a barebox: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-11 23:46:22 +02:00
Thomas Petazzoni
6fa85c6c03 barebox: bump version
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-11 23:41:44 +02:00
Thomas Petazzoni
b0d446dee4 Improve TARGETS handling for bootloaders and kernel
As the kernel and bootloaders do not use the normal BR2_PACKAGE_*
Kconfig options, their target name was not automatically added to the
global TARGETS variable. Each bootloader .mk and the linux.mk had to
add their own target manually to TARGETS, and the package
infrastructure was making tests on non-existing Kconfig variables.

This commit improves the package infrastructure so that it looks at
BR2_PACKAGE_<pkg> for packages, BR2_TARGET_<pkg> for bootloaders and
at the special BR2_LINUX_KERNEL for the linux package.

This allows to simplify a little bit the bootloaders and linux .mk
files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-11 23:40:23 +02:00
Thomas Petazzoni
1ff88054a8 barebox: convert to GENTARGETS
[Peter: add ':=' -> '=' change]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-10 13:57:48 +02:00
Peter Korsgaard
80eff66660 barebox: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-15 00:07:28 +02:00
Peter Korsgaard
5dd48b983d barebox: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-26 13:23:02 +02:00
Peter Korsgaard
4fb67dbb95 barebox: add option to build bareboxenv for target
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-06 21:40:19 +01:00
Peter Korsgaard
a7306b8aa5 barebox: use ccache if enabled
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-01 20:53:05 +01:00
Peter Korsgaard
01e46f8379 barebox: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-06 12:25:33 +01:00
Thomas Petazzoni
913b7d3d6f barebox: bump Barebox to 2010.11
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-16 14:52:30 +01:00
Peter Korsgaard
3e5e39a8a2 barebox/u-boot/linux: don't error out on missing config when make source
As it breaks 'make allyesconfig; make source', used for the source mirror.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-09-28 14:43:25 +02:00
Thomas Petazzoni
6cc9d936a9 Add support for the Barebox bootloader
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-06-12 16:03:24 +02:00