cleanup the whole addpattern / trx nonsense

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@243 3c298f89-4303-0410-b956-a3cf2f4a3e73

8 files changed, 12 insertions, 38 deletions

diff --git a/openwrt/package/openwrt/openwrt.mk b/openwrt/package/openwrt/openwrt.mk
index 06d0172a4..4945e69c6 100644
--- a/openwrt/package/openwrt/openwrt.mk
+++ b/openwrt/package/openwrt/openwrt.mk
@@ -99,7 +99,7 @@ openwrt-mtd: $(TARGET_DIR)/$(OPENWRT_MTD_TARGET_BINARY)
 
 # trx tool
 OPENWRT_TRX_SOURCE=package/openwrt/trx.c
-OPENWRT_TRX_TARGET=$(BUILD_DIR)/trx
+OPENWRT_TRX_TARGET=$(STAGING_DIR)/bin/trx
 
 $(OPENWRT_TRX_TARGET): 
 		$(CC) -o $(OPENWRT_TRX_TARGET) $(OPENWRT_TRX_SOURCE)
@@ -108,7 +108,7 @@ openwrt-trx: $(OPENWRT_TRX_TARGET)
 
 # addpattern tool
 OPENWRT_ADDPATTERN_SOURCE=package/openwrt/addpattern.c
-OPENWRT_ADDPATTERN_TARGET=$(BUILD_DIR)/addpattern
+OPENWRT_ADDPATTERN_TARGET=$(STAGING_DIR)/bin/addpattern
 
 $(OPENWRT_ADDPATTERN_TARGET): 
 		$(CC) -o $(OPENWRT_ADDPATTERN_TARGET) $(OPENWRT_ADDPATTERN_SOURCE)
diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index c2576fd55..791741a08 100644
--- a/openwrt/target/Config.in
+++ b/openwrt/target/Config.in
@@ -1,9 +1,5 @@
-#
-
-menu "Target Filesystem"
-
-source "target/jffs2/Config.in"
-source "target/squashfs/Config.in"
-
-endmenu
-
+choice
+	prompt "Target Root Filesystem"
+	source "target/jffs2/Config.in"
+	source "target/squashfs/Config.in"
+endchoice
diff --git a/openwrt/target/jffs2/Config.in b/openwrt/target/jffs2/Config.in
index 0d79dd1ff..ae14ad9da 100644
--- a/openwrt/target/jffs2/Config.in
+++ b/openwrt/target/jffs2/Config.in
@@ -1,5 +1,5 @@
 config BR2_TARGET_ROOTFS_JFFS2
-	bool "jffs2 root filesystem for the target device"
+	bool "jffs2"
 	default n
 	help
 	  Build a jffs2 root filesystem
diff --git a/openwrt/target/jffs2/Makefile.in b/openwrt/target/jffs2/Makefile.in
index 1da4903ee..ab8c2a8a5 100644
--- a/openwrt/target/jffs2/Makefile.in
+++ b/openwrt/target/jffs2/Makefile.in
@@ -1,3 +1,4 @@
 ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
 TARGETS+=jffs2root openwrt-image-jffs2
+ROOTFS=jffs2
 endif
diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk
index 7d30f4cc9..75f55aebb 100644
--- a/openwrt/target/jffs2/jffs2root.mk
+++ b/openwrt/target/jffs2/jffs2root.mk
@@ -44,16 +44,3 @@ jffs2root-clean:
 
 jffs2root-dirclean:
 	rm -rf $(MTD_DIR)
-
-openwrt-linux.trx.jffs2:
-	$(BUILD_DIR)/trx -o openwrt-linux.trx.jffs2 $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).jffs2
-
-openwrt-gs-code.bin.jffs2: openwrt-linux.trx.jffs2
-	$(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.jffs2 -o openwrt-gs-code.bin.jffs2 -g
-
-openwrt-g-code.bin.jffs2: openwrt-gs-code.bin.jffs2
-	sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.jffs2 > openwrt-g-code.bin.jffs2
-
-openwrt-image-jffs2:	openwrt-g-code.bin.jffs2
-
-
diff --git a/openwrt/target/squashfs/Config.in b/openwrt/target/squashfs/Config.in
index a4cb4d8b6..3ef5d2223 100644
--- a/openwrt/target/squashfs/Config.in
+++ b/openwrt/target/squashfs/Config.in
@@ -1,5 +1,5 @@
 config BR2_TARGET_ROOTFS_SQUASHFS
-	bool "squashfs (ro) root filesystem for the target device"
+	bool "squashfs"
 	default n
 	help
 	  Build a squashfs root filesystem
diff --git a/openwrt/target/squashfs/Makefile.in b/openwrt/target/squashfs/Makefile.in
index e3e10066e..14b7f74db 100644
--- a/openwrt/target/squashfs/Makefile.in
+++ b/openwrt/target/squashfs/Makefile.in
@@ -1,3 +1,4 @@
 ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y)
-TARGETS+=squashfsroot openwrt-image-squashfs
+TARGETS+=squashfsroot
+ROOTFS=squashfs
 endif
diff --git a/openwrt/target/squashfs/squashfsroot.mk b/openwrt/target/squashfs/squashfsroot.mk
index fce71643f..4dd6800a0 100644
--- a/openwrt/target/squashfs/squashfsroot.mk
+++ b/openwrt/target/squashfs/squashfsroot.mk
@@ -47,14 +47,3 @@ squashfsroot-clean:
 
 squashfsroot-dirclean:
 	rm -rf $(SQUASHFS_DIR)
-
-openwrt-linux.trx.squashfs:
-	$(BUILD_DIR)/trx -o openwrt-linux.trx.squashfs $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).squashfs
-
-openwrt-gs-code.bin.squashfs: openwrt-linux.trx.squashfs
-	$(BUILD_DIR)/addpattern -2 -i  openwrt-linux.trx.squashfs -o openwrt-gs-code.bin.squashfs -g
-
-openwrt-g-code.bin.squashfs: openwrt-gs-code.bin.squashfs
-	sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.squashfs > openwrt-g-code.bin.squashfs
-
-openwrt-image-squashfs:	openwrt-g-code.bin.squashfs