move spca5xx from target/linux/package/ to package/,

[openwrt.git] / target / linux / image / jffs2.mk

diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index c7d4335..dd5edd0 100644 (file)
--- a/target/linux/image/jffs2.mk
+++ b/target/linux/image/jffs2.mk
@@ -1,46 +1,26 @@
-ifneq ($(BR2_mips),y)
+ifneq ($(CONFIG_BIG_ENDIAN),y)

 JFFS2OPTS :=  --pad --little-endian --squash
 else
 JFFS2OPTS :=  --pad --big-endian --squash
 endif
 
 JFFS2OPTS :=  --pad --little-endian --squash
 else
 JFFS2OPTS :=  --pad --big-endian --squash
 endif
 

-#JFFS2OPTS += -Xlzo -msize -Xlzari
+define Image/mkfs/jffs2
+       rm -rf $(BUILD_DIR)/root/jffs
+       
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
+       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root

 
 

-jffs2-prepare:
-       $(MAKE) -C jffs2 prepare $(MAKE_TRACE)
+       $(call Image/Build,jffs2-64k)
+       $(call Image/Build,jffs2-128k)
+endef

 
 

-jffs2-compile: prepare-targets
-       $(MAKE) -C jffs2 compile $(MAKE_TRACE)
+$(STAGING_DIR)/bin/mkfs.jffs2:
+       $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile

 
 

-jffs2-clean:
-       $(MAKE) -C jffs2 clean $(MAKE_TRACE)
+jffs2-clean: FORCE
+       $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean

        rm -f $(KDIR)/root.jffs2*
 
        rm -f $(KDIR)/root.jffs2*
 

-$(KDIR)/root.jffs2-4MB: install-prepare
-       @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
-
-$(KDIR)/root.jffs2-8MB: install-prepare
-       @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE)
-
-ifeq ($(IB),)
-jffs2-install: compile-targets $(BOARD)-compile
-endif
-
-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
-       $(TRACE) target/linux/image/$(BOARD)/install
-       $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
-       $(TRACE) target/linux/image/$(BOARD)/install
-       $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
-
-jffs2-install-ib: compile-targets
-       mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
-       $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
-
-prepare-targets: jffs2-prepare
-compile-targets: jffs2-compile
-install-targets: jffs2-install
-install-ib: jffs2-install-ib
+compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2

 clean-targets: jffs2-clean
 
 clean-targets: jffs2-clean