diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-07-06 09:11:27 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 11:00:31 +0100 |
| commit | 8aec526820f9b7d3a32142ae6849d67dc273c1a6 (patch) | |
| tree | 90dbabc9105bca530f36c153170441b857e933e2 /meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch | |
| parent | bac2e1ccca7476b670b6ec9db4b4ecb43edbfed7 (diff) | |
| download | openembedded-core-contrib-8aec526820f9b7d3a32142ae6849d67dc273c1a6.tar.gz | |
uboot: Add 2011.06 Version
[YOCTO #1198]
Addes the 2011.06 version, while keeping the older 2011.03 version since
other layers might be using it still. This will need to be fixed in the
future as oe-core should only be keeping the current versions and layer
management addresses this somehow.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch')
| -rw-r--r-- | meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch new file mode 100644 index 0000000000..f4b12ac9f6 --- /dev/null +++ b/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch @@ -0,0 +1,39 @@ +From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> +Date: Thu, 3 Feb 2011 15:07:01 +0100 +Subject: Drop config.h include in tools/imximage.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Applied + +"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.4.4 + |