summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-rw-r--r--package/mtd/Config.in24
-rw-r--r--package/mtd/mtd.mk55
3 files changed, 42 insertions, 38 deletions
diff --git a/package/Config.in b/package/Config.in
index 13a2288ee..a96e28887 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -65,6 +65,7 @@ source "package/microwin/Config.in"
source "package/mkdosfs/Config.in"
source "package/mpg123/Config.in"
source "package/mrouted/Config.in"
+source "package/mtd/Config.in"
source "package/nano/Config.in"
source "package/ncurses/Config.in"
source "package/netkitbase/Config.in"
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index b05ffe801..390514c4e 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_MTD
bool "mtd/jffs2 utilities"
default n
+ select BR2_PACKAGE_ZLIB
help
Build mtd/jffs utilities
@@ -8,7 +9,7 @@ config BR2_PACKAGE_MTD_FLASH_ERASE
bool "flash_erase"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_FLASH_ERASEASLL
bool "flash_eraseall"
default y
@@ -39,6 +40,11 @@ config BR2_PACKAGE_MTD_JFFS2DUMP
default y
depends on BR2_PACKAGE_MTD
+config BR2_PACKAGE_MTD_SUMTOOL
+ bool "sumtool"
+ default y
+ depends on BR2_PACKAGE_MTD
+
config BR2_PACKAGE_MTD_FTL_CHECK
bool "ftl_check"
default y
@@ -48,22 +54,22 @@ config BR2_PACKAGE_MTD_FTL_FORMAT
bool "ftl_format"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_NFTL_FORMAT
bool "nftl_format"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_NFTLDUMP
bool "nftldump"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_MKFSJFFS2
bool "mkfs.jffs2"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_MKFSJFFS
bool "mkfs.jffs"
default y
@@ -73,22 +79,22 @@ config BR2_PACKAGE_MTD_NANDDUMP
bool "nanddump"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_NANDWRITE
bool "nandwrite"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_MTD_DEBUG
bool "mtd_debug"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_DOCFDISK
bool "docfdisk"
default y
depends on BR2_PACKAGE_MTD
-
+
config BR2_PACKAGE_MTD_DOC_LOADBIOS
bool "doc_loadbios"
default y
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index f0a230240..ceaa58199 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,19 +3,18 @@
# mtd provides jffs2 utilities
#
#############################################################
-MTD_SOURCE=mtd_20041007.orig.tar.gz
+MTD_SOURCE=mtd_20050122.orig.tar.gz
MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd
#############################################################
#
# Build mkfs.jffs2 for use on the local host system if
# needed by target/jffs2root.
-# If /sbin/mkfs.jffs2 already exists, no make is needed
#
#############################################################
-MKFS_JFFS2=$(shell which mkfs.jffs2 2>/dev/null || echo $(STAGING_DIR)/bin/mkfs.jffs2)
+MKFS_JFFS2 = $(MTD_HOST_DIR)/util/mkfs.jffs2
-MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd-20041007.orig
+MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd-20050122.orig
$(DL_DIR)/$(MTD_SOURCE):
$(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE)
@@ -27,10 +26,7 @@ $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_HOST_DIR)/util/mkfs.jffs2: $(MTD_HOST_DIR)/.unpacked
CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
$(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR)/util mkfs.jffs2
-
-$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_HOST_DIR)/util/mkfs.jffs2
- cp -f $(MTD_HOST_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin
-
+
mtd-host: $(MKFS_JFFS2)
mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
@@ -46,7 +42,7 @@ mtd-host-dirclean:
# build mtd for use on the target system
#
#############################################################
-MTD_DIR:=$(BUILD_DIR)/mtd-20041007.orig
+MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -55,24 +51,25 @@ $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
MTD_TARGETS_n :=
MTD_TARGETS_y :=
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs
-MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMPP) += nanddump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASEALL) += flash_eraseall
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_INFO) += flash_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS) += mkfs.jffs
+MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMPP) += nanddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y))
@@ -85,13 +82,13 @@ MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/util/%
cp -f $< $@
-mtd: $(MTD_TARGETS)
+mtd: zlib $(MTD_TARGETS)
mtd-source: $(DL_DIR)/$(MTD_SOURCE)
mtd-clean:
-$(MAKE) -C $(MTD_DIR) clean
-
+
mtd-dirclean:
rm -rf $(MTD_DIR)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 11:19:36 +0000