3cb668d5b5
Both the Barebox and AT91Bootstrap patches for the Calao USB A9G20
board are located in the same directory, board/calao/usb-a9g20-lpw/,
with only a prefix making a difference between whether they apply to
Barebox or AT91Bootstrap.
Unfortunately, since commit 0eba4759fa
("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.
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>
13 lines
446 B
Diff
13 lines
446 B
Diff
diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig
|
|
index 30bf380..7716e0e 100644
|
|
--- a/arch/arm/configs/usb_a9g20_defconfig
|
|
+++ b/arch/arm/configs/usb_a9g20_defconfig
|
|
@@ -15,6 +15,7 @@ CONFIG_HUSH_FANCY_PROMPT=y
|
|
CONFIG_CMDLINE_EDITING=y
|
|
CONFIG_AUTO_COMPLETE=y
|
|
CONFIG_MENU=y
|
|
+# CONFIG_ERRNO_MESSAGES is not set
|
|
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
|
|
CONFIG_CONSOLE_ACTIVATE_ALL=y
|
|
CONFIG_PARTITION=y
|