summaryrefslogtreecommitdiff
path: root/openwrt/target/jffs2
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 03:34:52 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 03:34:52 +0000
commit9d30652149fd745711342cec7ee8574e973ec241 (patch)
treeaad933069e7dedf29eb70dbfd81e9ca95d9b578f /openwrt/target/jffs2
parent0167360282da38c534a2698b415a8e2bed241d0a (diff)
nbd's makefile/menuconfig rewrite
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@307 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/jffs2')
-rw-r--r--openwrt/target/jffs2/Config.in5
-rw-r--r--openwrt/target/jffs2/Makefile36
-rw-r--r--openwrt/target/jffs2/jffs2root.mk19
3 files changed, 36 insertions, 24 deletions
diff --git a/openwrt/target/jffs2/Config.in b/openwrt/target/jffs2/Config.in
deleted file mode 100644
index c51ffc1cba..0000000000
--- a/openwrt/target/jffs2/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_TARGET_ROOTFS_JFFS2
- bool "jffs2"
- help
- Build a jffs2 root filesystem
-
diff --git a/openwrt/target/jffs2/Makefile b/openwrt/target/jffs2/Makefile
new file mode 100644
index 0000000000..ff63e6fc2a
--- /dev/null
+++ b/openwrt/target/jffs2/Makefile
@@ -0,0 +1,36 @@
+include $(TOPDIR)/rules.mk
+
+include ./jffs2root.mk
+
+TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
+
+prepare: $(MTD_DIR)/.unpacked
+compile: mtd
+install: compile $(TARGETS)
+clean: jffs2root-dirclean
+
+$(BIN_DIR)/openwrt-generic-jffs2-4MB.trx:
+ $(MKFS_JFFS2) --pad --little-endian --squash -e 0x10000 \
+ -d $(TARGET_DIR) -o $(IMAGE)-4MB.jffs2
+ PATH=$(TARGET_PATH) trx -o $@ \
+ $(LINUX_KERNEL) -a 0x10000 $(IMAGE)-4MB.jffs2
+
+$(BIN_DIR)/openwrt-generic-jffs2-8MB.trx:
+ $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
+ -d $(TARGET_DIR) -o $(IMAGE)-8MB.jffs2
+ PATH=$(TARGET_PATH) trx -o $@ \
+ $(LINUX_KERNEL) -a 0x20000 $(IMAGE)-8MB.jffs2
+
+$(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
+ PATH=$(TARGET_PATH) addpattern -2 -i $< -o $@ -g
+ $(SED) "1s,^W54S,W54G," $@
+
+$(BIN_DIR)/openwrt-wrt54gs-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
+ PATH=$(TARGET_PATH) addpattern -2 -i $< -o $@ -g
+
+$(BIN_DIR)/openwrt-motorola-jffs2-4MB.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
+ PATH=$(TARGET_PATH) motorola-bin $< $@
+
+$(BIN_DIR)/openwrt-motorola-jffs2-8MB.bin: $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
+ PATH=$(TARGET_PATH) motorola-bin $< $@
+
diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index 5a0259b27c..1c7b962cfe 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/target/jffs2/jffs2root.mk
@@ -28,13 +28,6 @@ mtd: $(MKFS_JFFS2)
#
#############################################################
-jffs2root: mtd
- -@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true;
- @rm -rf $(TARGET_DIR)/usr/man
- @rm -rf $(TARGET_DIR)/usr/info
- $(MKFS_JFFS2) --pad --little-endian --squash -e $(JFFS2_BLOCK_SIZE) \
- -d $(TARGET_DIR) -o $(IMAGE).jffs2
-
jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
jffs2root-clean:
@@ -42,15 +35,3 @@ jffs2root-clean:
jffs2root-dirclean:
rm -rf $(MTD_DIR)
-
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGETS+=openwrt-jffs2root openwrt-image
-ROOTFS=jffs2
-JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE)
-
-openwrt-image: openwrt
- @make jffs2root openwrt-code.bin TAG=W54G \
- EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000
- @make jffs2root openwrt-code.bin TAG=W54S \
- EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000
-endif