* [U-Boot] u-boot Tree Boken @ 2009-04-04 10:27 Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:00 ` Mike Frysinger 0 siblings, 1 reply; 8+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:27 UTC (permalink / raw) To: u-boot Hi all After the merge of the tools/Makefile cleanup the current tree is broken /work/u-boot-arm/lib_generic/crc32.c:157: error: conflicting types for 'crc32' /usr/include/zlib.h:1305: error: previous declaration of 'crc32' was here make[1]: *** No rule to make target `/work/u-boot-arm/tools/image.c', needed by `image.o'. Stop. make[1]: *** Waiting for unfinished jobs.... make[1]: *** [crc32.o] Error 1 make: *** [tools] Error 2 make: *** Waiting for unfinished jobs.... make: *** wait: No child processes. Stop. Best Regards, J ^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] u-boot Tree Boken 2009-04-04 10:27 [U-Boot] u-boot Tree Boken Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 11:00 ` Mike Frysinger 2009-04-04 10:46 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 8+ messages in thread From: Mike Frysinger @ 2009-04-04 11:00 UTC (permalink / raw) To: u-boot On Saturday 04 April 2009 06:27:01 Jean-Christophe PLAGNIOL-VILLARD wrote: > Hi all > > After the merge of the tools/Makefile cleanup > > the current tree is broken > > /work/u-boot-arm/lib_generic/crc32.c:157: error: conflicting types for > 'crc32' /usr/include/zlib.h:1305: error: previous declaration of 'crc32' > was here make[1]: *** No rule to make target > `/work/u-boot-arm/tools/image.c', needed by `image.o'. Stop. > make[1]: *** Waiting for unfinished jobs.... > make[1]: *** [crc32.o] Error 1 > make: *** [tools] Error 2 > make: *** Waiting for unfinished jobs.... > make: *** wait: No child processes. Stop. yeah, i hit both of these bugs as well. could you take a look Peter ? -mike ^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location 2009-04-04 11:00 ` Mike Frysinger @ 2009-04-04 10:46 ` Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 10:46 ` [U-Boot] [PATCH 2/2] rename include/zlib.h to include/u-boot/zlib.h Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:19 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Mike Frysinger 0 siblings, 2 replies; 8+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:46 UTC (permalink / raw) To: u-boot Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- tools/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 122e5bb..12f0216 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -190,7 +190,7 @@ $(obj)bin2header$(SFX): $(obj)bin2header.o $(STRIP) $@ # Some files complain if compiled with -pedantic, use FIT_CFLAGS -$(obj)image.o: $(SRCTREE)/tools/image.c +$(obj)image.o: $(SRCTREE)/common/image.c $(CC) -g $(FIT_CFLAGS) -c -o $@ $< $(obj)mkimage.o: $(SRCTREE)/tools/mkimage.c -- 1.6.1.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] rename include/zlib.h to include/u-boot/zlib.h 2009-04-04 10:46 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:46 ` Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 10:49 ` [U-Boot] [PATCH 2/2 V2] " Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:19 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Mike Frysinger 1 sibling, 1 reply; 8+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:46 UTC (permalink / raw) To: u-boot Some systems have zlib.h installed in /usr/include/. This isn't the desired file (we want the one in include/zlib.h). This will avoid the conflict. This fixes the host tools building problem by creating a new directory for U-Boot specific header files. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- common/cmd_bootm.c | 2 +- fs/cramfs/uncompress.c | 2 +- include/{ => u-boot}/zlib.h | 0 lib_arm/bootm.c | 2 +- lib_avr32/bootm.c | 2 +- lib_generic/crc32.c | 2 +- lib_generic/gunzip.c | 2 +- lib_generic/zlib.c | 2 +- lib_i386/bootm.c | 2 +- lib_m68k/bootm.c | 2 +- lib_microblaze/bootm.c | 2 +- lib_mips/bootm.c | 2 +- lib_ppc/bootm.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename include/{ => u-boot}/zlib.h (100%) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6fdeef4..bd1813a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -30,7 +30,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <environment.h> #include <lmb.h> diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 39dd275..228fe68 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -23,7 +23,7 @@ #include <common.h> #include <malloc.h> #include <watchdog.h> -#include <zlib.h> +#include <u-boot/zlib.h> static z_stream stream; diff --git a/include/zlib.h b/include/u-boot/zlib.h similarity index 100% rename from include/zlib.h rename to include/u-boot/zlib.h diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 7dbde7d..128b7e3 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 0ca4718..6a3172a 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -22,7 +22,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/arch/addrspace.h> #include <asm/io.h> diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index b6a7a91..3927ce1 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -17,7 +17,7 @@ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) #include <watchdog.h> #endif -#include "zlib.h" +#include "u-boot/zlib.h" #define local static #define ZEXPORT /* empty */ diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 5bcf5b7..01a4031 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -26,7 +26,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #define ZALLOC_ALIGNMENT 16 #define HEAD_CRC 2 diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c index 2b01c8f..d1cd44c 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -27,7 +27,7 @@ #define _Z_UTIL_H -#include "zlib.h" +#include "u-boot/zlib.h" #ifndef local # define local static diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c index ea19b3d..f96d7bd 100644 --- a/lib_i386/bootm.c +++ b/lib_i386/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/zimage.h> diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index 958c5ce..e5ed6eb 100755 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <watchdog.h> #include <environment.h> diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index e97aae6..bce4774 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -27,7 +27,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c index 3db22ea..54af24c 100644 --- a/lib_mips/bootm.c +++ b/lib_mips/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/addrspace.h> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index e03d763..0d702bf 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -29,7 +29,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <environment.h> #include <asm/byteorder.h> -- 1.6.1.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2 V2] rename include/zlib.h to include/u-boot/zlib.h 2009-04-04 10:46 ` [U-Boot] [PATCH 2/2] rename include/zlib.h to include/u-boot/zlib.h Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:49 ` Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:20 ` Mike Frysinger 2009-04-04 13:38 ` Wolfgang Denk 0 siblings, 2 replies; 8+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 10:49 UTC (permalink / raw) To: u-boot Some systems have zlib.h installed in /usr/include/. This isn't the desired file (we want the one in include/zlib.h). This will avoid the conflict. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- Fix commint Message Best Regards, J. common/cmd_bootm.c | 2 +- fs/cramfs/uncompress.c | 2 +- include/{ => u-boot}/zlib.h | 0 lib_arm/bootm.c | 2 +- lib_avr32/bootm.c | 2 +- lib_generic/crc32.c | 2 +- lib_generic/gunzip.c | 2 +- lib_generic/zlib.c | 2 +- lib_i386/bootm.c | 2 +- lib_m68k/bootm.c | 2 +- lib_microblaze/bootm.c | 2 +- lib_mips/bootm.c | 2 +- lib_ppc/bootm.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename include/{ => u-boot}/zlib.h (100%) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6fdeef4..bd1813a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -30,7 +30,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <environment.h> #include <lmb.h> diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 39dd275..228fe68 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -23,7 +23,7 @@ #include <common.h> #include <malloc.h> #include <watchdog.h> -#include <zlib.h> +#include <u-boot/zlib.h> static z_stream stream; diff --git a/include/zlib.h b/include/u-boot/zlib.h similarity index 100% rename from include/zlib.h rename to include/u-boot/zlib.h diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 7dbde7d..128b7e3 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 0ca4718..6a3172a 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -22,7 +22,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/arch/addrspace.h> #include <asm/io.h> diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index b6a7a91..3927ce1 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -17,7 +17,7 @@ #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) #include <watchdog.h> #endif -#include "zlib.h" +#include "u-boot/zlib.h" #define local static #define ZEXPORT /* empty */ diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 5bcf5b7..01a4031 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -26,7 +26,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #define ZALLOC_ALIGNMENT 16 #define HEAD_CRC 2 diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c index 2b01c8f..d1cd44c 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -27,7 +27,7 @@ #define _Z_UTIL_H -#include "zlib.h" +#include "u-boot/zlib.h" #ifndef local # define local static diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c index ea19b3d..f96d7bd 100644 --- a/lib_i386/bootm.c +++ b/lib_i386/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/zimage.h> diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index 958c5ce..e5ed6eb 100755 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <watchdog.h> #include <environment.h> diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index e97aae6..bce4774 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -27,7 +27,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c index 3db22ea..54af24c 100644 --- a/lib_mips/bootm.c +++ b/lib_mips/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> #include <asm/addrspace.h> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index e03d763..0d702bf 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -29,7 +29,7 @@ #include <command.h> #include <image.h> #include <malloc.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <bzlib.h> #include <environment.h> #include <asm/byteorder.h> -- 1.6.1.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2 V2] rename include/zlib.h to include/u-boot/zlib.h 2009-04-04 10:49 ` [U-Boot] [PATCH 2/2 V2] " Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 11:20 ` Mike Frysinger 2009-04-04 13:38 ` Wolfgang Denk 1 sibling, 0 replies; 8+ messages in thread From: Mike Frysinger @ 2009-04-04 11:20 UTC (permalink / raw) To: u-boot On Saturday 04 April 2009 06:49:11 Jean-Christophe PLAGNIOL-VILLARD wrote: > Some systems have zlib.h installed in /usr/include/. This isn't the > desired file (we want the one in include/zlib.h). This will avoid the > conflict. i would say "... desired file for u-boot code" > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. Url : http://lists.denx.de/pipermail/u-boot/attachments/20090404/e68ee028/attachment.pgp ^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2 V2] rename include/zlib.h to include/u-boot/zlib.h 2009-04-04 10:49 ` [U-Boot] [PATCH 2/2 V2] " Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:20 ` Mike Frysinger @ 2009-04-04 13:38 ` Wolfgang Denk 1 sibling, 0 replies; 8+ messages in thread From: Wolfgang Denk @ 2009-04-04 13:38 UTC (permalink / raw) To: u-boot Dear Jean-Christophe PLAGNIOL-VILLARD, In message <1238842151-24471-1-git-send-email-plagnioj@jcrosoft.com> you wrote: > Some systems have zlib.h installed in /usr/include/. This isn't the > desired file (we want the one in include/zlib.h). This will avoid the > conflict. > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > Fix commint Message > > Best Regards, > J. > common/cmd_bootm.c | 2 +- > fs/cramfs/uncompress.c | 2 +- > include/{ => u-boot}/zlib.h | 0 > lib_arm/bootm.c | 2 +- > lib_avr32/bootm.c | 2 +- > lib_generic/crc32.c | 2 +- > lib_generic/gunzip.c | 2 +- > lib_generic/zlib.c | 2 +- > lib_i386/bootm.c | 2 +- > lib_m68k/bootm.c | 2 +- > lib_microblaze/bootm.c | 2 +- > lib_mips/bootm.c | 2 +- > lib_ppc/bootm.c | 2 +- > 13 files changed, 12 insertions(+), 12 deletions(-) > rename include/{ => u-boot}/zlib.h (100%) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Neckties strangle clear thinking. -- Lin Yutang ^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location 2009-04-04 10:46 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 10:46 ` [U-Boot] [PATCH 2/2] rename include/zlib.h to include/u-boot/zlib.h Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-04 11:19 ` Mike Frysinger 1 sibling, 0 replies; 8+ messages in thread From: Mike Frysinger @ 2009-04-04 11:19 UTC (permalink / raw) To: u-boot On Saturday 04 April 2009 06:46:31 Jean-Christophe PLAGNIOL-VILLARD wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> -mike -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. Url : http://lists.denx.de/pipermail/u-boot/attachments/20090404/d23c4b0a/attachment.pgp ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-04-04 13:38 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-04-04 10:27 [U-Boot] u-boot Tree Boken Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:00 ` Mike Frysinger 2009-04-04 10:46 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 10:46 ` [U-Boot] [PATCH 2/2] rename include/zlib.h to include/u-boot/zlib.h Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 10:49 ` [U-Boot] [PATCH 2/2 V2] " Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 11:20 ` Mike Frysinger 2009-04-04 13:38 ` Wolfgang Denk 2009-04-04 11:19 ` [U-Boot] [PATCH 1/2] tools/Makefile: fix image.c dependancy location Mike Frysinger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox