Changeset 2568


Ignore:
Timestamp:
2005-11-29T13:40:29+01:00 (10 years ago)
Author:
wbx
Message:

fix flash map driver for squashfs images for wrt54gs

Location:
trunk/openwrt/target/linux/linux-2.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/linux-2.6/config/brcm

    r2566 r2568  
    13461346CONFIG_LOG_BUF_SHIFT=14 
    13471347CONFIG_CROSSCOMPILE=y 
    1348 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS1,115200" 
     1348CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" 
    13491349 
    13501350# 
  • trunk/openwrt/target/linux/linux-2.6/patches/brcm/002-flash-map.patch

    r2564 r2568  
    11diff -Nur linux-2.6.12.5/drivers/mtd/maps/bcm47xx-flash.c linux-2.6.12.5-flash/drivers/mtd/maps/bcm47xx-flash.c 
    22--- linux-2.6.12.5/drivers/mtd/maps/bcm47xx-flash.c     1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.12.5-flash/drivers/mtd/maps/bcm47xx-flash.c       2005-11-06 20:36:42.553198500 +0100 
    4 @@ -0,0 +1,329 @@ 
     3+++ linux-2.6.12.5-flash/drivers/mtd/maps/bcm47xx-flash.c       2005-11-29 12:50:51.416656000 +0100 
     4@@ -0,0 +1,333 @@ 
    55+/* 
    66+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) 
     
    223223+                       bcm947xx_parts[1].offset; 
    224224+       } else { 
    225 +               /* do not count the elf loader, which is on one sector */ 
     225+               /* do not count the elf loader, which is on one block */ 
    226226+               bcm947xx_parts[1].offset = bcm947xx_parts[0].size +  
    227227+                       bcm947xx_parts[3].size + mtd->erasesize; 
     
    249249+                       bcm947xx_parts[4].offset = bcm947xx_parts[2].offset +  
    250250+                               bcm947xx_parts[2].size; 
     251+                       if ((bcm947xx_parts[4].offset % mtd->erasesize) > 0) { 
     252+                               bcm947xx_parts[4].offset += mtd->erasesize -  
     253+                                       (bcm947xx_parts[4].offset % mtd->erasesize); 
     254+                       } 
    251255+                       bcm947xx_parts[4].size = bcm947xx_parts[3].offset -  
    252256+                               bcm947xx_parts[4].offset; 
Note: See TracChangeset for help on using the changeset viewer.