summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-04-26 19:01:52 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-04-26 19:30:15 (GMT)
commit4732f7aa822b70f4e5c4ba34f725a5968fb1e9a2 (patch)
tree27dc30381aad5330f9c3bbb8313ffad373fdb15f
parent49b6be29b07a1ffce55dc1070c196dab1886bb25 (diff)
downloadbuildroot-4732f7aa822b70f4e5c4ba34f725a5968fb1e9a2.tar.gz
buildroot-4732f7aa822b70f4e5c4ba34f725a5968fb1e9a2.tar.bz2
u-boot 2011.03: fix mkimage build failure when u-boot isn't configured
When mkimage is built without the rest of u-boot (for kernel uImage support), u-boot doesn't get configured for a specific board, so config.h isn't created and the build breaks. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--boot/u-boot/u-boot-2011.03-drop-configh.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/boot/u-boot/u-boot-2011.03-drop-configh.patch b/boot/u-boot/u-boot-2011.03-drop-configh.patch
new file mode 100644
index 0000000..bf524c9
--- /dev/null
+++ b/boot/u-boot/u-boot-2011.03-drop-configh.patch
@@ -0,0 +1,27 @@
+"make tools-all" should allow building tools such as mkimage and the new
+imximage without any config, but imximage.c currently fails to build
+with:
+imximage.h:27:20: error: config.h: No such file or directory
+
+config.h is not needed in imximage.h nor in imximage.c, and imximage.h
+is only included from imximage.c, so drop this include to fix the build.
+
+Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
+---
+ tools/imximage.h | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/imximage.h b/tools/imximage.h
+index 38ca6be..d126a46 100644
+--- a/tools/imximage.h
++++ b/tools/imximage.h
+@@ -24,8 +24,6 @@
+ #ifndef _IMXIMAGE_H_
+ #define _IMXIMAGE_H_
+
+-#include <config.h>
+-
+ #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+ #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */
+ #define APP_CODE_BARKER 0xB1
+-- 1.7.2.3