From: Markham Date: Fri, 1 Apr 2016 08:34:34 +0000 (+0200) Subject: now we use mtd-utils flash_erase instead of flash_eraseall from busyboy X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=929fe3781ced3d7b3e049b19742dcbde67a1d0d1;p=bs-cst-neutrino-hd.git 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 897a1c6..bc5405e 100644 --- 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 8b435a3..9eda364 100755 --- 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