configs: fix build of calao_qil_a9260_defconfig
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 3 Oct 2015 19:44:16 +0000 (20:44 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 4 Oct 2015 17:05:47 +0000 (19:05 +0200)
commit357cf46f9ac5b49897641c9f884cd96ccb8e6d51
tree7d02c29b140d16c13b2cc1d0d8fa4709efde1dae
parent3cb668d5b5272ab5d763a11264c28aee3fa1849a
configs: fix build of calao_qil_a9260_defconfig

The Barebox, AT91Bootstrap and Linux patches for the Calao QIL A9260
board are all located in the same directory, board/calao/qil-a9260/,
with only a prefix to indicate to which component they apply.

Unfortunately, since commit 0eba4759fab9d093afacac77a0ac31f1f0b3cceb
("packages: apply custom patches using *.patch instead of
<pkg>-*.patch"), the logic to apply custom patches in Barebox and
AT91Bootstrap has been changed from applying <package>-*.patch to
applying *.patch (in order to be consistent with what we do for all
packages in Buildroot).

However, this had the effect of trying to apply both the AT91Bootstrap
and Barebox patches on both packages, which obviously cannot work.

This commit fixes that by moving patches around, and switching to use
BR2_GLOBAL_PATCH_DIR for all of Barebox, AT91Bootstrap and Linux
patches.

In addition, the defconfig was not specifying explicitly which Barebox
version to use, so right now it's trying to use Barebox 2015.09, on
which the board-specific patch does not apply. So we've forced to use
Barebox 2012.08, which was the lastest release available at the time
the defconfig was initially contributed.

Cc: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch [deleted file]
board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch [deleted file]
board/calao/qil-a9260/linux-3.4.7.patch [deleted file]
board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch [new file with mode: 0644]
board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch [new file with mode: 0644]
board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch [new file with mode: 0644]
configs/calao_qil_a9260_defconfig