9
0
Fork 0
Commit Graph

500 Commits

Author SHA1 Message Date
Sascha Hauer ca2520ed55 Makefile: Add missing force for barebox-flash-image
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-12 18:39:25 +02:00
Sascha Hauer 90d92b359d Merge branch 'for-next/defaultenv-deps' 2012-10-03 21:18:10 +02:00
Sascha Hauer bee8dddbfc Merge branch 'for-next/omap'
Conflicts:
	Makefile
2012-10-03 21:11:48 +02:00
Sascha Hauer 4517b5980f Merge branch 'for-next/misc' 2012-10-03 21:10:57 +02:00
Sascha Hauer 3a9a4a4d70 Merge branch 'for-next/make' 2012-10-03 21:10:52 +02:00
Sascha Hauer 0124cb40f5 Release v2012.10.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-03 21:07:22 +02:00
Jan Luebbe 93ca711e64 scripts: add tool to create image for SPI boot on AM35xx
Booting from SPI on an AM35xx (and possibly other TI SOCs) requires
a special format:

- 32 bit image size in big-endian
- 32 bit load address in big-endian
- binary image converted from little- to big-endian

The mk-am35xx-spi-image tool converts barebox.bin to
this format.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-02 08:22:30 +02:00
Jan Luebbe 46bf132f15 Makefile: add target to produce a SPL compatible uImage
This is mostly useful during the initial port of barebox to a new
board which is supported by u-boot. It also allows starting barebox
from a SRAM-based u-boot SPL.

A different load address can be set like this:
make barebox.uimage UIMAGE_BASE=0x80000000

Also add barebox.ubl to CLEAN_FILES.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-29 13:08:01 +02:00
Sascha Hauer c8c49c14ae environment generation: Fix dependencies
The dependencies for generating the environment do not work properly:

- If files are removed from the defaultenv, a subsequent make will not
  update the default environment.
- If CONFIG_DEFAULT_ENVIRONMENT_PATH changes, the default environment
  also will not be regenerated.

This patch fixes this by introducing a cmd_env which has the content of
$(ENV_FILES) in the command so that the if_changed mechanism recognizes
a change when $(ENV_FILE) changes. This also results in a nice "  ENV "
string in the build process.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-28 16:21:44 +02:00
Jan Luebbe 606feec236 kbuild: keep the barebox binary accessible
When building a special image  from the original (compressed or
not) binary, to not overwrite KBUILD_BINARY.

This allows producing multiple images (such as MLO, UBL, ...)
from the (z)barebox.bin. In the case where no special image is
used, KBUILD_IMAGE is set to KBUILD_BINARY.

This patch was developed together with Sascha Hauer. Thanks!

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-06 19:31:49 +02:00
Sascha Hauer bed1a6ffab Merge branch 'for-next/pbl' 2012-09-05 12:59:29 +02:00
Sascha Hauer 1b47aa82b1 Release v2012.09.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-05 12:57:01 +02:00
Sascha Hauer b615445564 Makefile: generate a barebox-flash-image link
Depending on the SoC a barebox.bin, barebox.netx, barebox.s5p, MLO image
is generated. With pbl support there now is an additional
arch/arm/pbl/zbarebox.bin image.

To help the user to determine which image should be flashed to his device,
generate a barebox-flash-image link.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-08-12 16:16:44 +02:00
Sascha Hauer 8e724b3d3e Makefile.lib: add disasm and ln commands
disasm: For generating an disasssembly of an ELF file
ln: For creating a softlink

Use the disasm command for generating barebox.S

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-08-12 14:34:28 +02:00
Jean-Christophe PLAGNIOL-VILLARD 78867e2bbd Add pre-bootloader (pbl) image support
This allows for creating a pre-bootloader binary for
 - nand boot
 - mmc boot
 - compressed image

The pbl will be incharge of the lowlevel init if needed.
The barebox will skip it.

Import string functions from linux 3.4 (arch/arm/boot/compressed/string.c) and
implement a dummy panic.

For now on introduce dummy zbarebox* targets and c code that will contain later
the decompressor. This only implemeted on ARM.

This patch is based on Sascha Hauer <s.hauer@pengutronix.de>
Add compressed image support patch

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-08-03 18:09:13 +08:00
Jean-Christophe PLAGNIOL-VILLARD d4c42fb33d kbuild: add pre-bootloader (pbl) target
This will allow to link compiled object to the built-in-pbl.o across the source
tree that will be finally link to the pbl.

Now we compile the source %.c in pbl-%.o and provide -D__PBL__
so we can known in the source when it's compile for barebox or the pbl.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-08-03 17:17:05 +08:00
Sascha Hauer 80fb825db2 Release v2012.08.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-08-01 08:59:32 +02:00
Svetlana Khafizova 4d1fe257a3 Makefile: update barebox version if CONFIG_KALLSYMS is not set
If CONFIG_KALLSYMS is not set then barebox version is always "#0".
By-default on mips boards CONFIG_KALLSYMS don't set, so barebox
version does not increase after every build.
This patch fixes the problem.

Signed-off-by: Svetlana Khafizova <sv.khafizova@gmail.com>
Signed-off-by: Aleksey Kuleshov <rndfax@yandex.ru>
Acked-by:: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-07-23 22:09:19 +02:00
Sascha Hauer 6e4b15537b Merge branch 'for-next/misc' 2012-07-02 10:59:30 +02:00
Sascha Hauer 9d0b51ea7e Release v2012.07.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-07-02 10:31:52 +02:00
Sascha Hauer 5ecbd4a40f Makefile: echo size check error to stderr
To be able to see it when in my build tests stdout goes to /dev/null

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-06-30 12:47:04 +02:00
Roberto Nibali ba673498c9 Deal properly with scripts/bareboxenv-target
The bareboxenv-target binary is automatically created but never
deleted nor is it excluded from git tracking. This patch remedies
the situation by adding scripts/bareboxenv-target to .gitignnore
and adjusting the list of to be deleted files of the 'clean' target
in the core Makefile.

Signed-off-by: Roberto Nibali <rnibali@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-06-30 12:47:04 +02:00
Sascha Hauer 497d1c49f4 Merge branch 'next' 2012-06-06 14:11:57 +02:00
Sascha Hauer 94418c2d0d Release v2012.06.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-06-06 14:10:34 +02:00
Alexey Galakhov d1e782ed95 S5P boot header and image generator
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-21 21:58:26 +02:00
Sascha Hauer ce38019845 Merge branch 'next'
Conflicts:
	common/hush.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-03 20:10:13 +02:00
Sascha Hauer 71fadbafe2 Release v2012.05.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-03 09:39:33 +02:00
Antony Pavlov 6b489256ee Makefile: add barebox.srec to 'clean'
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-30 14:01:34 +02:00
Sascha Hauer 55c81081e5 Makefile: fix build timestamps
This patch adds the scripts/mkcompile_h from the Kernel. This gives
us additional information about the build like who built this binary
and with which compiler. Currently the only information used is the
build timestamp and the generation number.
This also fixes the build timestamp in the banner which is now correct
even with consecutive builds without making clean in between.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-15 15:18:17 +02:00
Sascha Hauer 2a6460cbb6 Merge branch 'next' 2012-04-05 11:09:58 +02:00
Sascha Hauer 4eb3478212 Release v2012.04.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-05 11:03:03 +02:00
Alexander Shiyan 20da230046 Add barebox.map and compressed default_env to distclean
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-04-02 10:07:48 +02:00
Sascha Hauer 8bf6924188 Release v2012.03.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-03-06 10:08:09 +01:00
Sascha Hauer 037cf6e80b Merge branch 'next' 2012-02-07 13:54:14 +01:00
Sascha Hauer 1943a1c101 Release v2012.02.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-06 12:55:01 +01:00
Jean-Christophe PLAGNIOL-VILLARD 064beaa73b add config to check if the size of barebox exceed the target size
CONFIG_BAREBOX_MAX_IMAGE_SIZE will allow to detected silent oversize result

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-17 18:48:54 +01:00
Jean-Christophe PLAGNIOL-VILLARD 18e18dd13b kconfig: sync to linux 3.2-rc4
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-01-11 21:22:34 +08:00
Sascha Hauer 0d22025084 Merge branch 'next' 2012-01-05 10:25:17 +01:00
Sascha Hauer ea2211218c Release v2012.01.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-04 16:04:40 +01:00
Sascha Hauer 316371d050 Makefile: disable warning: generating trampoline in object
Our stack is executable, so disable this warning

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-02 14:53:17 +01:00
Sascha Hauer 2ef61fa2c0 Makefile: disable unused-but-set-variable warning
This produces too many false positives.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-02 14:53:17 +01:00
Sascha Hauer 61b62f6d33 Release v2011.12.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-12-07 12:00:42 +01:00
Sascha Hauer d79d5ae88b Merge branch 'next' 2011-11-09 13:09:23 +01:00
Sascha Hauer 78202b7722 Release v2011.11.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-11-09 12:56:10 +01:00
Sascha Hauer 6b8503baab Merge branch 'master' into next 2011-10-23 13:38:39 +02:00
Loïc Minier 4e26fba680 Only pass -P to cpp when generating ld scripts
When building sandbox with ccache, one would hit warnings such as:
    warning: 'struct mmsghdr' declared inside parameter list
on random files; a way to reproduce this issue is to build a simple
file doing just:
    #include <sys/socket.h>

    int main(void) {
        return 0;
    }

    gcc -Wall -P -c -o foo foo.c

But actually the -P flag is only useful when generating non-C files,
such as linker scripts in the case of barebox.  Removing the -P flag
from all the gcc invocations, except when generating .lds files makes
the warning go away.  It turns out that this is what
linux/scripts/Makefile.build also does nowadays.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-10-18 09:18:41 +02:00
Sascha Hauer 7d5aee0467 Merge branch 'master' into next 2011-10-14 09:36:17 +02:00
Jean-Christophe PLAGNIOL-VILLARD 4ac3a1f9e0 move digest to crypto/
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-10-12 08:52:48 +02:00
Sascha Hauer 597da1b76e Merge branch 'next' 2011-10-09 03:58:49 +02:00
Sascha Hauer 0e7c77a3fd Release v2011.10.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-10-08 11:26:13 +02:00