aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-12-18 23:21:33 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-12-18 23:21:33 +0000
commit8d2cd6c9638bcaedf3e029a2736797f6e3aa3c4f (patch)
tree1c14e2e61e9af8c569e1dddf4314b0bddfee6659
parent1f60cf6c7c5bbcd46604fbf84b73e2b7069b6fbb (diff)
downloadupstream-8d2cd6c9638bcaedf3e029a2736797f6e3aa3c4f.tar.gz
upstream-8d2cd6c9638bcaedf3e029a2736797f6e3aa3c4f.tar.bz2
upstream-8d2cd6c9638bcaedf3e029a2736797f6e3aa3c4f.zip
fix image build for 2.6 and 4MB jffs2 images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2727 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/target/linux/image/brcm/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/openwrt/target/linux/image/brcm/Makefile b/openwrt/target/linux/image/brcm/Makefile
index 49c94f600f1..e2a81313584 100644
--- a/openwrt/target/linux/image/brcm/Makefile
+++ b/openwrt/target/linux/image/brcm/Makefile
@@ -47,6 +47,8 @@ $(BIN_DIR)/openwrt-wrt54gs-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-
install: $(BIN_DIR)/openwrt-wgt634u-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/openwrt-wrt54gs-$(KERNEL)-$(FSNAME).bin
endif
+
+ifneq ($(FS),jffs2-8MB)
$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
$(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
@@ -57,6 +59,8 @@ $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOAR
$(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
install: $(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin $(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin
+
+endif
endif
ifeq ($(KERNEL),2.4)