now we use mtd-utils flash_erase instead of flash_eraseall from busyboy

diff --git a/archive-patches/busybox-1.22.1-hd1.config b/archive-patches/busybox-1.22.1-hd1.config
index 897a1c62e33ca0d7a31edf8b826ccc5f1343cfd0..bc5405eb6a1cec4047bafee6c9ff516137522c4d 100644 (file)
--- a/archive-patches/busybox-1.22.1-hd1.config
+++ b/archive-patches/busybox-1.22.1-hd1.config
@@ -721,7 +721,7 @@ CONFIG_I2CDETECT=n
 CONFIG_FLASHCP=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
-CONFIG_FLASH_ERASEALL=y
+CONFIG_FLASH_ERASEALL=n
 # CONFIG_IONICE is not set
 # CONFIG_INOTIFYD is not set
 # CONFIG_LAST is not set

diff --git a/make/applications.mk b/make/applications.mk
index 8b435a3c4b35aa4707f7c23f00113e9f876ffa4b..9eda3643914b9ee5161580a73eb9548f0b4b9a12 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -257,17 +257,18 @@ $(D)/gdb-remote: $(ARCHIVE)/gdb-7.3.1.tar.bz2 | $(TARGETPREFIX)
        $(REMOVE)/gdb-7.3.1
        touch $@
 
+# MTD-UTILS
 ifeq ($(PLATFORM), nevis)
-$(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 | $(TARGETPREFIX)
-       tar -C $(BUILD_TMP) -xpf $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2
-       cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER) && \
-               $(MAKE) `pwd`/mkfs.jffs2 `pwd`/sumtool BUILDDIR=`pwd` WITHOUT_XATTR=1 WITHOUT_LZO=1 && \
-               cp -a mkfs.jffs2 sumtool $(HOSTPREFIX)/bin && \
-       rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER)
-       touch $@
+MTD_BUILDDIR = `pwd`/build
+MTD_BUILDS_HOST = \
+       $(MTD_BUILDDIR)/mkfs.jffs2 \
+       $(MTD_BUILDDIR)/sumtool \
+       $(MTD_BUILDDIR)/jffs2reader \
+       $(MTD_BUILDDIR)/jffs2dump
 
+MTD_BUILDS = \
+       $(MTD_BUILDDIR)/flash_erase
 else
-
 MTD_BUILDDIR = `pwd`/build
 MTD_BUILDS_HOST = \
        $(MTD_BUILDDIR)/mkfs.jffs2 \
@@ -280,7 +281,7 @@ MTD_BUILDS = \
        $(MTD_BUILDDIR)/nanddump \
        $(MTD_BUILDDIR)/nandwrite \
        $(MTD_BUILDDIR)/nandtest
-
+endif # ifeq ($(PLATFORM), nevis)
 $(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARGETPREFIX)
        # build for target
        rm -fr $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
@@ -308,7 +309,6 @@ $(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARG
        rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER) $(BUILD_TMP)/.remove
        touch $@
 
-endif # ifeq ($(PLATFORM), nevis)
 
 ifeq ($(PLATFORM), apollo)
 SMB_PREFIX=/usr