Browse Source

Correct spelling error and config option to create symlinks for old naming of MTD utilities. Also add in LDFLAGS and such to building with external toolchains.

"Steven J. Hill" 18 năm trước cách đây
mục cha
commit
d67d790dd1
2 tập tin đã thay đổi với 22 bổ sung3 xóa
  1. 6 1
      package/mtd/Config.in
  2. 16 2
      package/mtd/mtd.mk

+ 6 - 1
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

+ 16 - 2
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)