X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d6394045b13c2736e69bb167727d0fa4e252aa11..831e7a47848e5ea274e943307d4841064de74573:/target/linux/image/brcm/Makefile diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index c0c83c52f..23072bde9 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -27,6 +27,17 @@ endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(STAGING_DIR)/bin/trx -o $@ $(BUILD_DIR)/loader.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS) +ifeq ($(KERNEL),2.6) +FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) + +ifneq ($(FS),jffs2-4MB) +$(BIN_DIR)/openwrt-wgt634u-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx + dd if=$(BUILD_DIR)/loader.elf of=$@ bs=131072 conv=sync + cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx >> $@ + +install: $(BIN_DIR)/openwrt-wgt634u-$(KERNEL)-$(FSNAME).bin +endif +endif ifeq ($(KERNEL),2.4) FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) @@ -62,7 +73,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp -dpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin + cp -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -dpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ - cp -dpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ + cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/