upgrade kernel, quagga and openvpn, add licensing info to diag module, fix up jffs2

[openwrt.git] / openwrt / target / jffs2 / Makefile

diff --git a/openwrt/target/jffs2/Makefile b/openwrt/target/jffs2/Makefile
index ca61feb..0e14ac6 100644 (file)
--- a/openwrt/target/jffs2/Makefile
+++ b/openwrt/target/jffs2/Makefile
@@ -3,6 +3,8 @@ include $(TOPDIR)/rules.mk
 include ./jffs2root.mk
 
 TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
 include ./jffs2root.mk
 
 TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx

+JFFS2OPTS :=  --pad --little-endian --squash -d $(TARGET_DIR)
+#JFFS2OPTS += -Xlzo -msize -Xlzari

 
 prepare: $(MTD_DIR)/.unpacked
 compile: mtd
 
 prepare: $(MTD_DIR)/.unpacked
 compile: mtd


@@ -10,15 +12,13 @@ install: compile $(TARGETS)
 clean: jffs2root-dirclean
 
 $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx:
 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_LOADER) \
+       $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x10000 -o $(IMAGE)-4MB.jffs2
+       PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \

         $(LINUX_IMAGE) -a 0x10000 $(IMAGE)-4MB.jffs2
 
 $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx:
         $(LINUX_IMAGE) -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_LOADER) \
+       $(MKFS_JFFS2) $(JFFS2OPTS) -e 0x20000 -o $(IMAGE)-8MB.jffs2
+       PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \

         $(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2
         
 $(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
         $(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2
         
 $(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx