Skip to contentSkip to conversation

u-boot Tree Boken

U-Boot New Jean-Christophe PLAGNIOL-VILLARD 3 participants 8 messages Apr 4, 2009 Cramfs filesystem

lore
Share & tools
lore
#0 lore raw

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

#1 lore raw
Quoted 6 lines · 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

Quoted 9 lines

/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

#2 lore raw

PATCH 1/2 tools/Makefile: fix image.c dependancy location

---
 tools/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
tools/Makefile +1 -1
index 122e5bb..12f0216 100644
@@ -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
Signature · 1 line
1.6.1.3
#3 lore raw

PATCH 2/2 rename include/zlib.h to include/u-boot/zlib.h

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.

---
 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%)
common/cmd_bootm.c +1 -1
index 6fdeef4..bd1813a 100644
@@ -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>
fs/cramfs/uncompress.c +1 -1
index 39dd275..228fe68 100644
@@ -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;
 
include/u-boot/zlib.h renamed from include/zlib.h +0 -0
similarity index 100%
rename from include/zlib.h
rename to include/u-boot/zlib.h
lib_arm/bootm.c +1 -1
index 7dbde7d..128b7e3 100644
@@ -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;
lib_avr32/bootm.c +1 -1
index 0ca4718..6a3172a 100644
@@ -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>
lib_generic/crc32.c +1 -1
index b6a7a91..3927ce1 100644
@@ -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 */
lib_generic/gunzip.c +1 -1
index 5bcf5b7..01a4031 100644
@@ -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
lib_generic/zlib.c +1 -1
index 2b01c8f..d1cd44c 100644
@@ -27,7 +27,7 @@
 
 #define _Z_UTIL_H
 
-#include "zlib.h"
+#include "u-boot/zlib.h"
 
 #ifndef local
 #  define local static
lib_i386/bootm.c +1 -1
index ea19b3d..f96d7bd 100644
@@ -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>
 
lib_m68k/bootm.c +1 -1
index 958c5ce..e5ed6eb 100755
@@ -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>
lib_microblaze/bootm.c +1 -1
index e97aae6..bce4774 100644
@@ -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;
lib_mips/bootm.c +1 -1
index 3db22ea..54af24c 100644
@@ -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>
 
lib_ppc/bootm.c +1 -1
index e03d763..0d702bf 100644
@@ -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>
Signature · 1 line
1.6.1.3
#4 lore raw

PATCH v2 2/2 rename include/zlib.h to include/u-boot/zlib.h

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.

---
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%)
common/cmd_bootm.c +1 -1
index 6fdeef4..bd1813a 100644
@@ -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>
fs/cramfs/uncompress.c +1 -1
index 39dd275..228fe68 100644
@@ -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;
 
include/u-boot/zlib.h renamed from include/zlib.h +0 -0
similarity index 100%
rename from include/zlib.h
rename to include/u-boot/zlib.h
lib_arm/bootm.c +1 -1
index 7dbde7d..128b7e3 100644
@@ -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;
lib_avr32/bootm.c +1 -1
index 0ca4718..6a3172a 100644
@@ -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>
lib_generic/crc32.c +1 -1
index b6a7a91..3927ce1 100644
@@ -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 */
lib_generic/gunzip.c +1 -1
index 5bcf5b7..01a4031 100644
@@ -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
lib_generic/zlib.c +1 -1
index 2b01c8f..d1cd44c 100644
@@ -27,7 +27,7 @@
 
 #define _Z_UTIL_H
 
-#include "zlib.h"
+#include "u-boot/zlib.h"
 
 #ifndef local
 #  define local static
lib_i386/bootm.c +1 -1
index ea19b3d..f96d7bd 100644
@@ -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>
 
lib_m68k/bootm.c +1 -1
index 958c5ce..e5ed6eb 100755
@@ -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>
lib_microblaze/bootm.c +1 -1
index e97aae6..bce4774 100644
@@ -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;
lib_mips/bootm.c +1 -1
index 3db22ea..54af24c 100644
@@ -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>
 
lib_ppc/bootm.c +1 -1
index e03d763..0d702bf 100644
@@ -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>
Signature · 1 line
1.6.1.3
#5 lore raw

PATCH v2 2/2 rename include/zlib.h to include/u-boot/zlib.h

Quoted 3 lines · 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"

Quoted 1 line

-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

#6 lore raw

PATCH v2 2/2 rename include/zlib.h to include/u-boot/zlib.h

In reply to Jean-Christophe PLAGNIOL-VILLARD

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 10 lines · In message <[email protected]> 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.

---
Fix commint Message

Best Regards,
J.

Quoted 15 lines
 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

Signature · 4 lines
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
#7 lore raw

PATCH 1/2 tools/Makefile: fix image.c dependancy location

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line · On Saturday 04 April 2009 06:46:31 Jean-Christophe PLAGNIOL-VILLARD wrote:

-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