reduce wasted flash space by ~56K on Edimax devices, thanks to Bernhard Held (closes: #2549)

SVN-Revision: 9450
This commit is contained in:
Gabor Juhos 2007-10-26 07:51:49 +00:00
parent 41815ee5c8
commit d29af25874
2 changed files with 5 additions and 9 deletions

View file

@ -51,7 +51,7 @@ struct trx_header {
u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions */ u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions */
}; };
#define BLOCK_LEN_MIN 0x10000 #define TRX_ALIGN 0x1000
static int trx_nr_parts; static int trx_nr_parts;
static unsigned long trx_offset; static unsigned long trx_offset;
@ -104,17 +104,12 @@ err_out:
static void trxsplit_findtrx(struct mtd_info *mtd) static void trxsplit_findtrx(struct mtd_info *mtd)
{ {
unsigned long offset; unsigned long offset;
unsigned long blocklen;
int err; int err;
blocklen = mtd->erasesize;
if (blocklen < BLOCK_LEN_MIN)
blocklen = BLOCK_LEN_MIN;
printk(KERN_INFO PFX "searching TRX header in '%s'\n", mtd->name); printk(KERN_INFO PFX "searching TRX header in '%s'\n", mtd->name);
err = 0; err = 0;
for (offset = 0; offset < mtd->size; offset += blocklen) { for (offset = 0; offset < mtd->size; offset += TRX_ALIGN) {
err = trxsplit_checktrx(mtd, offset); err = trxsplit_checktrx(mtd, offset);
if (err == 0) if (err == 0)
break; break;

View file

@ -14,13 +14,14 @@ define Image/Build/Edimax
$(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2)) $(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2))
$(call Image/Build/TRXNoloader,$(call imgname,$(1),$(2)).trx,$(1)) $(call Image/Build/TRXNoloader,$(call imgname,$(1),$(2)).trx,$(1))
$(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d -w \ $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d -w \
-r $(KDIR)/loader-$(2).gz \ -r $(KDIR)/loader-$(2).gz::8192 \
-x $(call imgname,$(1),$(2)).trx \ -x $(call imgname,$(1),$(2)).trx \
$(call imgname,$(1),$(2))-webui.bin $(call imgname,$(1),$(2))-webui.bin
$(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d \ $(STAGING_DIR_HOST)/bin/mkcsysimg -B $(2) -d \
-r $(KDIR)/loader-$(2).gz \ -r $(KDIR)/loader-$(2).gz::8192 \
-x $(call imgname,$(1),$(2)).trx \ -x $(call imgname,$(1),$(2)).trx \
$(call imgname,$(1),$(2))-xmodem.bin $(call imgname,$(1),$(2))-xmodem.bin
rm -f $(call imgname,$(1),$(2)).trx
endef endef
define Image/Build/Infineon define Image/Build/Infineon