remove early_initcall hacks

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

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

 JFFS2OPTS :=  --pad --little-endian --squash
 JFFS2OPTS :=  --pad --little-endian --squash

-#JFFS2OPTS += -Xlzo -msize -Xlzari
+else
+JFFS2OPTS :=  --pad --big-endian --squash
+endif

 
 

-jffs2-prepare:
-       $(MAKE) -C jffs2 prepare
+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-compile:
-       $(MAKE) -C jffs2 compile
+       $(call Image/Build,jffs2-64k)
+       $(call Image/Build,jffs2-128k)
+endef

 
 

-jffs2-clean:
-       $(MAKE) -C jffs2 clean
-       rm -f $(KDIR)/root.jffs2*
-
-$(KDIR)/root.jffs2-4MB:
-       @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
-
-$(KDIR)/root.jffs2-8MB:
-       @rm -rf $(KDIR)/root/jffs
-       $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
+$(STAGING_DIR)/bin/mkfs.jffs2:
+       $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile

 
 

-jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
-       $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
-       $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
-
-jffs2-install-ib:
-       mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
-       cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin
+jffs2-clean: FORCE
+       $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean
+       rm -f $(KDIR)/root.jffs2*

 
 

-prepare: jffs2-prepare
-compile: jffs2-compile
-install: jffs2-install
-install-ib: jffs2-install-ib
-clean: jffs2-clean
+compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2
+clean-targets: jffs2-clean