summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/mtd/Config.in7
-rw-r--r--package/mtd/mtd.mk18
2 files changed, 22 insertions, 3 deletions
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index d38ab2348..582082d4b 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -57,7 +57,7 @@ config BR2_PACKAGE_MTD_FLASH_INFO
depends on BR2_PACKAGE_MTD
config BR2_PACKAGE_MTD_FLASH_LOCK
- bool "flash_loco"
+ bool "flash_lock"
default y
depends on BR2_PACKAGE_MTD
@@ -71,6 +71,11 @@ config BR2_PACKAGE_MTD_FLASHCP
default y
depends on BR2_PACKAGE_MTD
+config BR2_PACKAGE_MTD_ERASE
+ bool "erase"
+ default y
+ depends on BR2_PACKAGE_MTD
+
config BR2_PACKAGE_MTD_JFFS2DUMP
bool "jffs2dump"
default y
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 2d122e6e1..2f3c782aa 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -116,14 +116,21 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y))
$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
- CFLAGS="-I$(LINUX_HEADERS_DIR)/include $(TARGET_CFLAGS)" \
- $(MAKE) CC=$(TARGET_CC) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
+ $(MAKE) CC=$(TARGET_CC) CFLAGS="-I$(LINUX_HEADERS_DIR)/include -I$(MTD_DIR)/include $(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/util/%
+ mkdir -p $(TARGET_DIR)/usr/sbin
cp -f $< $@
$(STRIP) $@
+ifneq ($(BR2_PACKAGE_MTD_FLASHCP),)
+ -ln -sf flashcp $(TARGET_DIR)/usr/sbin/fcp
+endif
+ifneq ($(BR2_PACKAGE_MTD_ERASE),)
+ -ln -sf flash_erase $(TARGET_DIR)/usr/sbin/erase
+ -ln -sf flash_eraseall $(TARGET_DIR)/usr/sbin/eraseall
+endif
mtd: zlib $(MTD_TARGETS)
@@ -131,6 +138,13 @@ mtd-source: $(DL_DIR)/$(MTD_SOURCE)
mtd-clean:
-$(MAKE) -C $(MTD_DIR) clean
+ifneq ($(BR2_PACKAGE_MTD_FLASHCP),)
+ -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/fcp
+endif
+ifneq ($(BR2_PACKAGE_MTD_ERASE),)
+ -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/erase
+ -rm -f $(MTD_TARGETS) $(TARGET_DIR)/usr/sbin/eraseall
+endif
mtd-dirclean:
rm -rf $(MTD_DIR)