diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-27 17:38:36 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-27 17:38:36 +0000 |
| commit | 82992995248a80b24b854ec8f2edd4496f92b84b (patch) | |
| tree | 81cb463a8c8d13b1f52ad668c26bdf043d0be785 | |
| parent | 07f362a34dee5a659a57b9a6e332322706d58f13 (diff) | |
ar71xx: update image generation and trx header parsing for the WRT160NL
* patch by Bernhard Loos
* note: trailing whitespaces has been removed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20525 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c | 7 | ||||
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 14 |
2 files changed, 6 insertions, 15 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c index da54e0ff4..e42b3d401 100644 --- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c +++ b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c @@ -123,12 +123,7 @@ static int wrt160nl_parse_partitions(struct mtd_info *master, goto free_hdr; } - kernel_len = uheader->ih_size / master->erasesize; - if (uheader->ih_size % master->erasesize) - kernel_len++; - - kernel_len++; - kernel_len *= master->erasesize; + kernel_len = le32_to_cpu(theader->offsets[1]) + sizeof(struct cybertan_header); trx_parts[0].name = "u-boot"; trx_parts[0].offset = 0; diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index e57808e5c..00580fd8a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -318,16 +318,12 @@ endef define Image/Build/CyberTAN $(call PatchKernelGzip,$(2),$(3)) $(call MkImageGzip,$(KDIR)/vmlinux-$(2).bin.gz,$(KDIR)/vmlinux-$(2).uImage) - ( \ - dd if=$(KDIR)/vmlinux-$(2).uImage bs=64k conv=sync; \ - dd if=/dev/zero bs=1 count=65476; \ - dd if=$(KDIR)/root.$(1) bs=64k; \ - ) > $(KDIR)/vmlinux-$(2).image - $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/vmlinux-$(2).trx \ - -f $(KDIR)/vmlinux-$(2).image - -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \ - -i $(KDIR)/vmlinux-$(2).trx \ + $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR)/vmlinux-$(2).uImage \ + -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1) + -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) \ + -i $(KDIR)/image.tmp \ -o $(call imgname,$(1),$(2)).bin + rm $(KDIR)/image.tmp endef wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware) |