[at91] fix dfboot linking failures (#5937)

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 686c5a5..237d87c 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -23,15 +23,15 @@ JFFS2OPTS     :=  --pad --big-endian --squash
 SQUASHFS_OPTS :=  -be
 endif
 
 SQUASHFS_OPTS :=  -be
 endif
 

-ifneq ($(CONFIG_LINUX_2_6_29)$(CONFIG_LINUX_2_6_30),)
-USE_SQUASHFS4 := y
+ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
+USE_SQUASHFS3 := y

 endif
 
 endif
 

-ifneq ($(USE_SQUASHFS4),)
-MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
-SQUASHFS_OPTS  := -lzma
-else
+ifneq ($(USE_SQUASHFS3),)

 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma

+else
+MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
+SQUASHFS_OPTS  := -lzma -processors 1

 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k
 endif
 
 JFFS2_BLOCKSIZE ?= 64k 128k


@@ -92,7 +92,7 @@ endif
 define Image/Checksum
        ( cd ${BIN_DIR} ; \
                $(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | xargs \
 define Image/Checksum
        ( cd ${BIN_DIR} ; \
                $(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | xargs \

-               md5sum > md5sums \
+               md5sum --binary > md5sums \

        )
 endef
 
        )
 endef