From 5e97d0cb641bcf887531ba86640542cd0da3eaee Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jul 2005 18:46:19 +0000 Subject: remove trx stuff from ar7 images and flash map git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1524 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/image/ar7/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'target/linux/image') diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index c3ffb25a9..3cde04bc3 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -41,19 +41,17 @@ $(BIN_DIR)/openwrt-ar7-zimage.bin: $(KDIR)/vmlinux.gz compile -o $(KDIR)/loader $(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre $(PKG_BUILD_DIR)/srec2bin $(KDIR)/ram_zimage.sre $@ - dd if=/dev/zero bs=1024 count=1 >> $@ -ALIGN:=1024 ifeq ($(FS),jffs2-8MB) -ALIGN:=131072 +ALIGN:=bs=131072 conv=sync endif ifeq ($(FS),jffs2-4MB) -ALIGN:=65536 +ALIGN:=bs=65536 conv=sync endif $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin: - dd if=$(BIN_DIR)/openwrt-ar7-zimage.bin bs=$(ALIGN) conv=sync | head -c -1024 > $@ - $(STAGING_DIR)/bin/trx -a 1024 $(BUILD_DIR)/linux-$(KERNEL)-ar7/root.$(FS) >> $@ + dd if=$(BIN_DIR)/openwrt-ar7-zimage.bin $(ALIGN) > $@ + cat $(BUILD_DIR)/linux-$(KERNEL)-ar7/root.$(FS) >> $@ define pattern_template $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS)-$(1).bin: $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin -- cgit v1.2.3