Rootfs: update mtd-utils and make JFFS2 filesystem image useable

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

7 files changed, 197 insertions, 97 deletions

diff --git a/Kconfig b/Kconfig
index b6baf2f..3879623 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,26 +1,25 @@
 ################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
-# For Copyrright from linux kernel's build/configure system, see their source
-# code.
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         Kconfig
 # \brief	Kconfig of Embtoolkit
-# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         May 2009
 ################################################################################
 mainmenu "Embedded systems toolkit configuration"
@@ -77,8 +76,9 @@ config EMBTK_HAVE_ROOTFS
 	 Select packages in "Packages to include in your root filesystem".
 
 if EMBTK_HAVE_ROOTFS
-source "kconfig/fs.kconfig"
-source "kconfig/packages.kconfig"
+source kconfig/mtdutils.kconfig
+source kconfig/fs.kconfig
+source kconfig/packages.kconfig
 endif
 
 menu "Embtoolkit build options"
diff --git a/kconfig/fs.kconfig b/kconfig/fs.kconfig
index d51fb6b..a9a55c4 100644
--- a/kconfig/fs.kconfig
+++ b/kconfig/fs.kconfig
@@ -45,19 +45,38 @@ choice
 		 Use bzip2 compression algorithm.
 endchoice
 
-#JFFS2 root filesystem image build
+#####################################
+# JFFS2 root filesystem image build #
+#####################################
 config EMBTK_ROOTFS_HAVE_JFFS2
 	bool "Build a JFFS2 root filesystem image"
+	select EMBTK_HOST_HAVE_MTDUTILS
 	help
-	 Build a JFFS2 root filesystem image for your target
-config EMBTK_ROOTFS_HAVE_JFFS2_BLOCKSIZE
+		Build a JFFS2 root filesystem image for your target.
+config EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE
 	depends on EMBTK_ROOTFS_HAVE_JFFS2
 	help
-	 Erase block size to use in KB
-	int "Erase block size to use in KB"
-	default 128
+		Erase block size to use in bytes
+		NOTE: If erase block size is below 4096 the unit is assumed
+		to be KiB
+	int "Erase block size to use in bytes"
+	default 16384
+config EMBTK_ROOTFS_HAVE_JFFS2_PAGESIZE
+	depends on EMBTK_ROOTFS_HAVE_JFFS2
+	help
+		Page size to use in bytes
+	int "Page size to use in bytes"
+	default 4096
+config EMBTK_ROOTFS_HAVE_JFFS2_CLEANMARKERSIZE
+	depends on EMBTK_ROOTFS_HAVE_JFFS2
+	help
+		Size of cleanmarker in bytes (almost always 12)
+	int "Size of cleanmarker in bytes (almost always 12)"
+	default 12
 
-#SQUASHFS root filesystem
+############################
+# SQUASHFS root filesystem #
+############################
 config EMBTK_ROOTFS_HAVE_SQUASHFS
 	bool "Build a squashfs root filesystem image"
 	help
diff --git a/kconfig/mtdutils.kconfig b/kconfig/mtdutils.kconfig
new file mode 100644
index 0000000..a1360ac
--- /dev/null
+++ b/kconfig/mtdutils.kconfig
@@ -0,0 +1,52 @@
+################################################################################
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2010 Abdoulaye Walsimou GAYE. All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+#
+# \file         mtdutils.kconfig
+# \brief	mtdutils.kconfig of Embtoolkit.
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# \date         August 2010
+################################################################################
+
+config EMBTK_HOST_HAVE_MTDUTILS
+	bool
+	select EMBTK_HAVE_UTILLINUXNG
+	help
+		mtd-utils intented to run on the host development machine.
+choice
+	prompt "mtd-utils version used"
+	depends on EMBTK_HOST_HAVE_MTDUTILS || EMBTK_ROOTFS_HAVE_MTDUTILS
+	help
+		mtd-utils version used
+		NOTE: This version of mtd-utils is patched to fix various issue,
+		these patches come from mtd-utils git repository.
+
+	config EMBTK_MTDUTILS_VERSION_1_3_1
+		bool "mtd-utils-1.3.1"
+		select EMBTK_MTDUTILS_NEED_PATCH
+		help
+			mtd-utils-1.3.1
+endchoice
+
+config EMBTK_MTDUTILS_VERSION_STRING
+	string
+	default "1.3.1"		if EMBTK_MTDUTILS_VERSION_1_3_1
+
+config EMBTK_MTDUTILS_NEED_PATCH
+	bool
+
diff --git a/mk/fs.mk b/mk/fs.mk
index af09cd7..774698b 100644
--- a/mk/fs.mk
+++ b/mk/fs.mk
@@ -41,11 +41,21 @@ build_jffs2_rootfs:
 	$(call EMBTK_GENERIC_MESSAGE,"Generating JFFS2 root filesystem...")
 	@$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \
 	$(HOSTTOOLS)/usr/sbin/mkfs.jffs2 \
-	-n -e $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_BLOCKSIZE) -r $(ROOTFS) \
+	--eraseblock=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE) \
+	--pad=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE) \
+	--pagesize=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_PAGESIZE) \
+	--cleanmarker=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_CLEANMARKERSIZE) \
+	$(if $(CONFIG_EMBTK_TARGET_ARCH_LITTLE_ENDIAN), \
+		--little-endian, --big-endian) \
+	-n --root=$(ROOTFS) \
 	-o $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp
 	@$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \
 	$(HOSTTOOLS)/usr/sbin/sumtool \
-	-n -e $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_BLOCKSIZE) \
+	--eraseblock=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE) \
+	--cleanmarker=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_CLEANMARKERSIZE) \
+	$(if $(CONFIG_EMBTK_TARGET_ARCH_LITTLE_ENDIAN), \
+		--littleendian, --bigendian) \
+	-n -p \
 	-i $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp \
 	-o $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2
 	@rm -rf $(EMBTK_ROOT)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).jffs2.temp
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index 7ebc6fd..d2128cc 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -1,97 +1,117 @@
 ################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         mtd-utils.mk
 # \brief	mtd-utils.mk of Embtoolkit.
-# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         June 2009
 ################################################################################
 
-MTD-UTILS_VERSION := 1.2.0
-MTD-UTILS_SITE := ftp://ftp.infradead.org/pub/mtd-utils
-MTD-UTILS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/mtd-utils
-MTD-UTILS_PACKAGE := mtd-utils-$(MTD-UTILS_VERSION).tar.bz2
-MTD-UTILS_PATCH := mtd-utils.patch
-MTD-UTILS_HOST_BUILD_DIR := $(TOOLS_BUILD)/mtd-utils-build
-MTD-UTILS_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/mtd-utils-build
+MTDUTILS_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_MTDUTILS_VERSION_STRING)))
+MTDUTILS_SITE := ftp://ftp.infradead.org/pub/mtd-utils
+MTDUTILS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/mtd-utils/$(MTDUTILS_VERSION)
+MTDUTILS_PACKAGE := mtd-utils-$(MTDUTILS_VERSION).tar.bz2
+MTDUTILS_HOST_BUILD_DIR := $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+
+MTDUTILS_SBINS := bin2nand flash_eraseall flash_unlock mkfs.jffs2 nand2bin \
+		nftl_format rfddump ubicrc32 ubimirror ubirmvol docfdisk \
+		flash_info ftl_check mkfs.ubifs nanddump pddcustomize \
+		rfdformat ubicrc32.pl ubimkvol ubirsvol doc_loadbios \
+		flash_lock ftl_format mkpfi nandtest pfi2bin serve_image \
+		ubidetach ubinfo ubiupdatevol flashcp flash_otp_dump \
+		jffs2dump mtd_debug nandwrite pfiflash sumtool ubiformat \
+		ubinize unubi flash_erase flash_otp_info mkbootenv mtdinfo \
+		nftldump recv_image ubiattach ubigen ubirename
 
-MTD-UTILS_BINS := docfdisk flash_erase flash_lock flash_unlock jffs2dump \
-nanddump nftldump rfddump sumtool doc_loadbios flash_eraseall flash_otp_dump \
-ftl_check mkfs.jffs2 nandtest nftl_format rfdformat flashcp flash_info \
-flash_otp_info ftl_format mtd_debug nandwrite recv_image serve_image
+##############################################
+# mtd-utils for the host development machine #
+##############################################
 
-mtd-utils_host_install: $(MTD-UTILS_HOST_BUILD_DIR)/.installed
-mtd-utils_target_install: $(MTD-UTILS_TARGET_BUILD_DIR)/.installed
+MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install \
+		utillinuxng_host_install
 
-#mtd-utils for host
-$(MTD-UTILS_HOST_BUILD_DIR)/.installed: zlib_host_install lzo_host_install \
-download_mtd-utils $(MTD-UTILS_HOST_BUILD_DIR)/.decompressed
+mtdutils_host_install: $(MTDUTILS_HOST_BUILD_DIR)/.installed
+
+$(MTDUTILS_HOST_BUILD_DIR)/.installed:  $(MTDUTILS_HOST_DEPS) \
+	download_mtdutils $(MTDUTILS_HOST_BUILD_DIR)/.decompressed
 	LDFLAGS="-L$(HOSTTOOLS)/usr/local/lib" \
-	CFLAGS="-I. -I./include -I$(HOSTTOOLS)/usr/local/include \
-	-I$(HOSTTOOLS)/usr/include" DESTDIR=$(HOSTTOOLS) CROSS= \
-	$(MAKE) -C $(TOOLS_BUILD)/mtd-utils-$(MTD-UTILS_VERSION) install
+	CPPFLAGS="-I. -I$(HOSTTOOLS)/usr/local/include -I$(HOSTTOOLS)/usr/include" \
+	DESTDIR=$(HOSTTOOLS) \
+	BUILDDIR=$(MTDUTILS_HOST_BUILD_DIR) \
+	$(MAKE) -C $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION) install
 	@touch $@
 
-$(MTD-UTILS_HOST_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTD-UTILS_PACKAGE)...")
-	@tar -C $(TOOLS_BUILD) -xjvf $(DOWNLOAD_DIR)/$(MTD-UTILS_PACKAGE)
-	cd  $(TOOLS_BUILD)/mtd-utils-$(MTD-UTILS_VERSION); \
-	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils.patch
-	@mkdir -p $(MTD-UTILS_HOST_BUILD_DIR)
+$(MTDUTILS_HOST_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTDUTILS_PACKAGE)...")
+	@tar -C $(TOOLS_BUILD) -xvf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
+ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
+	cd $(MTDUTILS_HOST_BUILD_DIR); \
+	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch
+endif
 	@touch $@
 
-mtd-utils_host_clean:
+mtdutils_host_clean:
 	$(call EMBTK_GENERIC_MESSAGE,"Cleaning mtd-utils in host ...")
-	@if [ -e $(MTD-UTILS_HOST_BUILD_DIR)/.installed ]; then \
-		cd $(HOSTTOOLS)/usr/sbin; rm -rf $(MTD-UTILS_BINS); \
-	fi
 
-#mtd-utils for target
-$(MTD-UTILS_TARGET_BUILD_DIR)/.installed: zlib_target_install \
-lzo_target_install download_mtd-utils $(MTD-UTILS_TARGET_BUILD_DIR)/.decompressed
+########################
+# mtd-utils for target #
+########################
+
+MTDUTILS_DEPS := zlib_target_install lzo_target_install utillinuxng_install
+
+mtdutils_target_install: $(MTDUTILS_TARGET_BUILD_DIR)/.installed
+
+$(MTDUTILS_TARGET_BUILD_DIR)/.installed: $(MTDUTILS_DEPS) download_mtdutils \
+	$(MTDUTILS_TARGET_BUILD_DIR)/.decompressed
 	LDFLAGS="-L$(SYSROOT)/usr/local/lib" \
-	CFLAGS="-I. -I./include -I$(SYSROOT)/usr/local/include \
-	-I$(SYSROOT)/usr/include" DESTDIR=$(SYSROOT) \
+	CPPFLAGS="-I. -I./include -I$(SYSROOT)/usr/local/include -I$(SYSROOT)/usr/include" \
+	BUILDDIR=$(MTDUTILS_TARGET_BUILD_DIR) DESTDIR=$(SYSROOT) \
 	PATH=$(PATH):$(TOOLS)/bin CROSS=$(CROSS_COMPILE) \
-	$(MAKE) -C $(PACKAGES_BUILD)/mtd-utils-$(MTD-UTILS_VERSION) install
+	$(MAKE) -C $(PACKAGES_BUILD)/mtd-utils-$(MTDUTILS_VERSION) install
 	@touch $@
 
-$(MTD-UTILS_TARGET_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTD-UTILS_PACKAGE)...")
-	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(MTD-UTILS_PACKAGE)
-	cd  $(PACKAGES_BUILD)/mtd-utils-$(MTD-UTILS_VERSION); \
-	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils.patch
-	@mkdir -p $(MTD-UTILS_TARGET_BUILD_DIR)
+$(MTDUTILS_TARGET_BUILD_DIR)/.decompressed:
+	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(MTDUTILS_PACKAGE)...")
+	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE)
+ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
+	@cd $(MTDUTILS_TARGET_BUILD_DIR); \
+	patch -p1 < $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch
+endif
 	@touch $@
 
-mtd-utils_target_clean:
+mtdutils_target_clean:
 	$(call EMBTK_GENERIC_MESSAGE,"Cleaning mtd-utils in target ...")
-	@if [ -e $(MTD-UTILS_TARGET_BUILD_DIR)/.installed ]; then \
-		cd $(SYSROOT)/usr/sbin; rm -rf $(MTD-UTILS_BINS); \
-	fi
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(MTDUTILS_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(MTDUTILS_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(MTDUTILS_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(MTDUTILS_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(MTDUTILS_PKGCONFIGS)
 
-download_mtd-utils:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(MTD-UTILS_PACKAGE) \
+download_mtdutils:
+	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(MTDUTILS_PACKAGE) \
 	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(MTD-UTILS_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(MTD-UTILS_PACKAGE) \
-	$(MTD-UTILS_SITE)/$(MTD-UTILS_PACKAGE)
-	@test -e $(DOWNLOAD_DIR)/$(MTD-UTILS_PATCH) || \
-	wget -O $(DOWNLOAD_DIR)/$(MTD-UTILS_PATCH) \
-	$(MTD-UTILS_PATCH_SITE)/$(MTD-UTILS_PATCH)
-
+	@test -e $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) || \
+	wget -O $(DOWNLOAD_DIR)/$(MTDUTILS_PACKAGE) \
+	$(MTDUTILS_SITE)/$(MTDUTILS_PACKAGE)
+ifeq ($(CONFIG_EMBTK_MTDUTILS_NEED_PATCH),y)
+	@test -e $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch || \
+	wget -O $(DOWNLOAD_DIR)/mtd-utils-$(MTDUTILS_VERSION).patch \
+	$(MTDUTILS_PATCH_SITE)/mtd-utils-$(MTDUTILS_VERSION)-*.patch
+endif
diff --git a/mk/packages.mk b/mk/packages.mk
index 3dd7298..69ce6cb 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -54,8 +54,8 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_STRACE) += strace_install
 include $(EMBTK_ROOT)/mk/strace.mk
 
 # Flash manipulation tools: mtd-utils
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS) += mtd-utils_target_install
-ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS) += mtdutils_target_install
+ROOTFS_COMPONENTS_CLEAN += mtdutils_target_clean
 
 #Compression packages
 ROOTFS_COMPONENTS_CLEAN += zlib_target_clean
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index c62b183..de56dc3 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -42,8 +42,7 @@ ROOTFS_HOSTTOOLS-y += makedevs_install fakeroot_install pkgconfig_install
 FILESYSTEMS-$(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO) += build_initramfs_archive
 
 #Does jffs2 filesystem selected?
-ROOTFS_HOSTTOOLS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtd-utils_host_install
-ROOTFS_HOSTTOOLS_CLEAN-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtd-utils_host_clean
+ROOTFS_HOSTTOOLS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtdutils_host_install
 FILESYSTEMS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += build_jffs2_rootfs
 
 #Does squashfs filesystem selected?