Changeset 82d3616 in freewrt


Ignore:
Timestamp:
Sep 23, 2006, 5:47:31 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
6844bce
Parents:
2fa597b
Message:

fix mtd partitions for netgear

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@665 afb5a338-a214-0410-bd46-81f09a774fd1

File:
1 edited

Legend:

Unmodified
Added
Removed

  • target/linux/brcm-2.4/patches/003-flash-map.patch

    r2fa597b r82d3616  
     1diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in linux-2.4.32-freewrt/drivers/mtd/maps/Config.in
     2--- linux-2.4.32/drivers/mtd/maps/Config.in     Fri Jun 13 16:51:34 2003
     3+++ linux-2.4.32-freewrt/drivers/mtd/maps/Config.in     Thu Sep 21 19:17:45 2006
     4@@ -48,6 +48,8 @@
     5 fi
     6 
     7 if [ "$CONFIG_MIPS" = "y" ]; then
     8+   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
     9+   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX board for Netgear WGT634u' CONFIG_MTD_BCM947XX_NETGEAR $CONFIG_MTD_CFI
     10    dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     11    dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
     12    dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
     13diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in.orig linux-2.4.32-freewrt/drivers/mtd/maps/Config.in.orig
     14--- linux-2.4.32/drivers/mtd/maps/Config.in.orig        Thu Jan  1 01:00:00 1970
     15+++ linux-2.4.32-freewrt/drivers/mtd/maps/Config.in.orig        Fri Jun 13 16:51:34 2003
     16@@ -0,0 +1,103 @@
     17+# drivers/mtd/maps/Config.in
     18+
     19+# $Id: Config.in,v 1.43 2003/01/24 14:26:38 dwmw2 Exp $
     20+
     21+mainmenu_option next_comment
     22+
     23+comment 'Mapping drivers for chip access'
     24+
     25+dep_tristate '  CFI Flash device in physical memory map' CONFIG_MTD_PHYSMAP $CONFIG_MTD_GEN_PROBE
     26+if [ "$CONFIG_MTD_PHYSMAP" = "y" -o "$CONFIG_MTD_PHYSMAP" = "m" ]; then
     27+   hex '    Physical start address of flash mapping' CONFIG_MTD_PHYSMAP_START 0x8000000
     28+   hex '    Physical length of flash mapping' CONFIG_MTD_PHYSMAP_LEN 0x4000000
     29+   int '    Bus width in octets' CONFIG_MTD_PHYSMAP_BUSWIDTH 2
     30+fi
     31+
     32+if [ "$CONFIG_SPARC" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
     33+   dep_tristate '  Sun Microsystems userflash support' CONFIG_MTD_SUN_UFLASH $CONFIG_MTD_CFI
     34+fi
     35+
     36+if [ "$CONFIG_X86" = "y" ]; then
     37+   dep_tristate '  CFI Flash device mapped on Photron PNC-2000' CONFIG_MTD_PNC2000 $CONFIG_MTD_CFI $CONFIG_MTD_PARTITIONS
     38+   dep_tristate '  CFI Flash device mapped on AMD SC520 CDP' CONFIG_MTD_SC520CDP $CONFIG_MTD_CFI
     39+   dep_tristate '  CFI Flash device mapped on AMD NetSc520'  CONFIG_MTD_NETSC520 $CONFIG_MTD_CFI $CONFIG_MTD_PARTITIONS
     40+   dep_tristate '  CFI Flash device mapped on Arcom SBC-GXx boards' CONFIG_MTD_SBC_GXX $CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_PARTITIONS
     41+   dep_tristate '  CFI Flash device mapped on Arcom ELAN-104NC' CONFIG_MTD_ELAN_104NC $CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_PARTITIONS
     42+   dep_tristate '  CFI Flash device mapped on DIL/Net PC' CONFIG_MTD_DILNETPC $CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_PARTITIONS $CONFIG_MTD_CONCAT
     43+   if [ "$CONFIG_MTD_DILNETPC" = "y" -o "$CONFIG_MTD_DILNETPC" = "m" ]; then
     44+     hex '    Size of boot partition' CONFIG_MTD_DILNETPC_BOOTSIZE 0x80000
     45+   fi
     46+   dep_tristate '  JEDEC Flash device mapped on Mixcom piggyback card' CONFIG_MTD_MIXMEM $CONFIG_MTD_JEDEC
     47+   dep_tristate '  JEDEC Flash device mapped on Octagon 5066 SBC' CONFIG_MTD_OCTAGON $CONFIG_MTD_JEDEC
     48+   dep_tristate '  JEDEC Flash device mapped on Tempustech VMAX SBC301' CONFIG_MTD_VMAX $CONFIG_MTD_JEDEC
     49+   dep_tristate '  Flash device mapped with DOCCS on NatSemi SCx200' CONFIG_MTD_SCx200_DOCFLASH $CONFIG_MTD_CFI
     50+   dep_tristate '  BIOS flash chip on Intel L440GX boards' CONFIG_MTD_L440GX $CONFIG_MTD_JEDECPROBE
     51+   dep_tristate '  ROM connected to AMD76X southbridge' CONFIG_MTD_AMD76XROM $CONFIG_MTD_GEN_PROBE   
     52+   dep_tristate '  ROM connected to Intel Hub Controller 2' CONFIG_MTD_ICH2ROM $CONFIG_MTD_JEDECPROBE
     53+   dep_tristate '  CFI Flash device mapped on SnapGear/SecureEdge' CONFIG_MTD_NETtel $CONFIG_MTD_PARTITIONS
     54+   dep_tristate '  BIOS flash chip on Intel SCB2 boards' CONFIG_MTD_SCB2_FLASH $CONFIG_MTD_GEN_PROBE
     55+fi
     56+
     57+if [ "$CONFIG_PPC" = "y" ]; then
     58+   dep_tristate '  CFI Flash device mapped on TQM8XXL' CONFIG_MTD_TQM8XXL $CONFIG_MTD_CFI $CONFIG_TQM8xxL
     59+   dep_tristate '  CFI Flash device mapped on RPX Lite or CLLF' CONFIG_MTD_RPXLITE $CONFIG_MTD_CFI
     60+   dep_tristate '  System flash on MBX860 board' CONFIG_MTD_MBX860 $CONFIG_MTD_CFI
     61+   dep_tristate '  CFI Flash device mapped on D-Box2' CONFIG_MTD_DBOX2 $CONFIG_MTD_CFI
     62+   dep_tristate '  CFI Flash device mapping on FlagaDM' CONFIG_MTD_CFI_FLAGADM $CONFIG_MTD_CFI
     63+   dep_tristate '  CFI Flash device mapped on IBM Redwood-4/5' CONFIG_MTD_REDWOOD $CONFIG_MTD_CFI
     64+fi
     65+
     66+if [ "$CONFIG_MIPS" = "y" ]; then
     67+   dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     68+   dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
     69+   dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
     70+   if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
     71+       -o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
     72+      bool '  Pb[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT
     73+      bool '  Pb[15]00 user flash device (2nd 32MiB bank)' CONFIG_MTD_PB1500_USER
     74+   fi
     75+   dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS
     76+   if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
     77+      hex '    Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
     78+      hex '    Physical length of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_LEN 0x4000000
     79+      int '    Bus width in octets' CONFIG_MTD_CSTM_MIPS_IXX_BUSWIDTH 2
     80+   fi
     81+   dep_tristate '  Momenco Ocelot boot flash device' CONFIG_MTD_OCELOT $CONFIG_MOMENCO_OCELOT
     82+   dep_tristate '  LASAT flash device' CONFIG_MTD_LASAT $CONFIG_MTD_CFI $CONFIG_LASAT
     83+fi
     84+
     85+if [ "$CONFIG_SUPERH" = "y" ]; then
     86+   dep_tristate '  CFI Flash device mapped on Hitachi SolutionEngine' \
     87+      CONFIG_MTD_SOLUTIONENGINE $CONFIG_MTD_PARTITIONS $CONFIG_MTD_CFI
     88+   if [ "$CONFIG_MTD_SOLUTIONENGINE" != "n" ]; then
     89+      hex '  Default reserved Flash size'  CONFIG_MTD_SUPERH_RESERVE 0x00010000
     90+   fi
     91+fi
     92+
     93+if [ "$CONFIG_ARM" = "y" ]; then
     94+   dep_tristate '  CFI Flash device mapped on Nora' CONFIG_MTD_NORA $CONFIG_MTD_CFI
     95+   dep_tristate '  CFI Flash device mapped on ARM Integrator/P720T' CONFIG_MTD_ARM_INTEGRATOR $CONFIG_MTD_CFI
     96+   dep_tristate '  Cirrus CDB89712 evaluation board mappings' CONFIG_MTD_CDB89712 $CONFIG_MTD_CFI $CONFIG_ARCH_CDB89712
     97+   dep_tristate '  CFI Flash device mapped on StrongARM SA11x0' CONFIG_MTD_SA1100 $CONFIG_MTD_CFI $CONFIG_ARCH_SA1100 $CONFIG_MTD_PARTITIONS
     98+   dep_tristate '  CFI Flash device mapped on DC21285 Footbridge' CONFIG_MTD_DC21285 $CONFIG_MTD_CFI $CONFIG_ARCH_FOOTBRIDGE
     99+   dep_tristate '  CFI Flash device mapped on the XScale IQ80310 board' CONFIG_MTD_IQ80310 $CONFIG_MTD_CFI $CONFIG_ARCH_IQ80310
     100+   dep_tristate '  CFI Flash device mapped on Epxa10db' CONFIG_MTD_EPXA10DB $CONFIG_MTD_CFI  $CONFIG_MTD_PARTITIONS $CONFIG_ARCH_CAMELOT
     101+   dep_tristate '  CFI Flash device mapped on the FortuNet board' CONFIG_MTD_FORTUNET $CONFIG_MTD_CFI $CONFIG_MTD_PARTITIONS $CONFIG_SA1100_FORTUNET
     102+   dep_tristate '  NV-RAM mapping AUTCPU12 board' CONFIG_MTD_AUTCPU12 $CONFIG_ARCH_AUTCPU12
     103+   dep_tristate '  CFI Flash device mapped on EDB7312' CONFIG_MTD_EDB7312 $CONFIG_MTD_CFI
     104+   dep_tristate '  JEDEC Flash device mapped on impA7' CONFIG_MTD_IMPA7 $CONFIG_MTD_JEDECPROBE
     105+   dep_tristate '  JEDEC Flash device mapped on Ceiva/Polaroid PhotoMax Digital Picture Frame' CONFIG_MTD_CEIVA $CONFIG_MTD_JEDECPROBE  $CONFIG_ARCH_CEIVA
     106+fi
     107+if [ "$CONFIG_ALPHA" = "y" ]; then
     108+   dep_tristate '  Flash chip mapping on TSUNAMI' CONFIG_MTD_TSUNAMI $CONFIG_MTD_GENPROBE
     109+fi
     110+
     111+if [ "$CONFIG_UCLINUX" = "y" ]; then
     112+   dep_tristate '  Generic uClinux RAM/ROM filesystem support' CONFIG_MTD_UCLINUX $CONFIG_MTD_PARTITIONS
     113+fi
     114+
     115+# This needs CFI or JEDEC, depending on the cards found.
     116+dep_tristate '  PCI MTD driver' CONFIG_MTD_PCI $CONFIG_MTD $CONFIG_PCI
     117+dep_tristate '  PCMCIA MTD driver' CONFIG_MTD_PCMCIA $CONFIG_MTD $CONFIG_PCMCIA
     118+
     119+endmenu
     120diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile linux-2.4.32-freewrt/drivers/mtd/maps/Makefile
     121--- linux-2.4.32/drivers/mtd/maps/Makefile      Fri Jun 13 16:51:34 2003
     122+++ linux-2.4.32-freewrt/drivers/mtd/maps/Makefile      Thu Sep 21 19:17:45 2006
     123@@ -3,6 +3,8 @@
     124 #
     125 # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
     126 
     127+EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
     128+
     129 BELOW25                := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
     130 
     131 ifeq ($(BELOW25),y)
     132@@ -10,6 +12,8 @@
     133 endif
     134 
     135 # Chip mappings
     136+obj-$(CONFIG_MTD_BCM947XX)     += bcm947xx-flash.o
     137+obj-$(CONFIG_MTD_BCM947XX_NETGEAR)     += bcm947xx-netgear-flash.o
     138 obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
     139 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
     140 obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o
     141diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile.orig linux-2.4.32-freewrt/drivers/mtd/maps/Makefile.orig
     142--- linux-2.4.32/drivers/mtd/maps/Makefile.orig Thu Jan  1 01:00:00 1970
     143+++ linux-2.4.32-freewrt/drivers/mtd/maps/Makefile.orig Fri Jun 13 16:51:34 2003
     144@@ -0,0 +1,65 @@
     145+#
     146+# linux/drivers/maps/Makefile
     147+#
     148+# $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
     149+
     150+BELOW25                := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
     151+
     152+ifeq ($(BELOW25),y)
     153+O_TARGET       := mapslink.o
     154+endif
     155+
     156+# Chip mappings
     157+obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
     158+obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
     159+obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o
     160+obj-$(CONFIG_MTD_CSTM_MIPS_IXX)        += cstm_mips_ixx.o
     161+obj-$(CONFIG_MTD_DC21285)      += dc21285.o
     162+obj-$(CONFIG_MTD_DILNETPC)     += dilnetpc.o
     163+obj-$(CONFIG_MTD_ELAN_104NC)   += elan-104nc.o
     164+obj-$(CONFIG_MTD_EPXA10DB)     += epxa10db-flash.o
     165+obj-$(CONFIG_MTD_IQ80310)      += iq80310.o
     166+obj-$(CONFIG_MTD_L440GX)       += l440gx.o
     167+obj-$(CONFIG_MTD_AMD76XROM)    += amd76xrom.o
     168+obj-$(CONFIG_MTD_ICH2ROM)      += ich2rom.o
     169+obj-$(CONFIG_MTD_TSUNAMI)      += tsunami_flash.o
     170+obj-$(CONFIG_MTD_MBX860)       += mbx860.o
     171+obj-$(CONFIG_MTD_NORA)         += nora.o
     172+obj-$(CONFIG_MTD_CEIVA)                += ceiva.o
     173+obj-$(CONFIG_MTD_OCTAGON)      += octagon-5066.o
     174+ifneq ($(CONFIG_MTD_PHYSMAP),n)
     175+  ifeq ($(CONFIG_MTD_PHYSMAP_BUSWIDTH),8)
     176+    obj-$(CONFIG_MTD_PHYSMAP)  += physmap64.o
     177+  else
     178+    obj-$(CONFIG_MTD_PHYSMAP)  += physmap.o
     179+  endif
     180+endif
     181+obj-$(CONFIG_MTD_PNC2000)      += pnc2000.o
     182+obj-$(CONFIG_MTD_PCMCIA)       += pcmciamtd.o
     183+obj-$(CONFIG_MTD_RPXLITE)      += rpxlite.o
     184+obj-$(CONFIG_MTD_TQM8XXL)      += tqm8xxl.o
     185+obj-$(CONFIG_MTD_SA1100)       += sa1100-flash.o
     186+obj-$(CONFIG_MTD_SBC_GXX)      += sbc_gxx.o
     187+obj-$(CONFIG_MTD_SC520CDP)     += sc520cdp.o
     188+obj-$(CONFIG_MTD_NETSC520)     += netsc520.o
     189+obj-$(CONFIG_MTD_SUN_UFLASH)   += sun_uflash.o
     190+obj-$(CONFIG_MTD_VMAX)         += vmax301.o
     191+obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx200_docflash.o
     192+obj-$(CONFIG_MTD_DBOX2)                += dbox2-flash.o
     193+obj-$(CONFIG_MTD_OCELOT)       += ocelot.o
     194+obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
     195+obj-$(CONFIG_MTD_PCI)          += pci.o
     196+obj-$(CONFIG_MTD_PB1000)       += pb1xxx-flash.o
     197+obj-$(CONFIG_MTD_PB1100)       += pb1xxx-flash.o
     198+obj-$(CONFIG_MTD_PB1500)       += pb1xxx-flash.o
     199+obj-$(CONFIG_MTD_LASAT)                += lasat.o
     200+obj-$(CONFIG_MTD_AUTCPU12)     += autcpu12-nvram.o
     201+obj-$(CONFIG_MTD_EDB7312)      += edb7312.o
     202+obj-$(CONFIG_MTD_IMPA7)                += impa7.o
     203+obj-$(CONFIG_MTD_FORTUNET)     += fortunet.o
     204+obj-$(CONFIG_MTD_REDWOOD)      += redwood.o
     205+obj-$(CONFIG_MTD_UCLINUX)      += uclinux.o
     206+obj-$(CONFIG_MTD_NETtel)       += nettel.o
     207+obj-$(CONFIG_MTD_SCB2_FLASH)   += scb2_flash.o
     208+
     209+include $(TOPDIR)/Rules.make
    1210diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c
    2 --- linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c      1970-01-01 01:00:00.000000000 +0100
    3 +++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c      2006-09-16 21:23:45.000000000 +0200
     211--- linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c      Thu Jan  1 01:00:00 1970
     212+++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c      Thu Sep 21 19:17:45 2006
    4213@@ -0,0 +1,346 @@
    5214+/*
    … …  
    349558+module_init(init_bcm947xx_map);
    350559+module_exit(cleanup_bcm947xx_map);
     560diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c.orig linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c.orig
    351561diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-netgear-flash.c linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-netgear-flash.c
    352 --- linux-2.4.32/drivers/mtd/maps/bcm947xx-netgear-flash.c      1970-01-01 01:00:00.000000000 +0100
    353 +++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-netgear-flash.c      2006-09-16 21:24:47.000000000 +0200
     562--- linux-2.4.32/drivers/mtd/maps/bcm947xx-netgear-flash.c      Thu Jan  1 01:00:00 1970
     563+++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-netgear-flash.c      Thu Sep 21 19:26:25 2006
    354564@@ -0,0 +1,356 @@
    355565+/*
    … …  
    511721+       { name: "rootfs", offset: 0, size: 0, },
    512722+       { name: "config", offset: 0, size: 0, mask_flags: MTD_WRITEABLE, },
    513 +       { name: "data", offset: 0, size: 0, },
    514723+       { name: "fwcf", offset: 0, size: 0, },
    515724+       { name: "nvram", offset: 0, size: 0, mask_flags: MTD_WRITEABLE, },
     725+       { name: "data", offset: 0, size: 0, },
    516726+       { name: NULL, },
    517727+};
    … …  
    574784+
    575785+       /* fwcf 128 kB before nvram */
    576 +       bcm947xx_parts[5].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize)
     786+       bcm947xx_parts[4].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize)
    577787+               - 128*1024;
    578 +       bcm947xx_parts[5].size   = 128*1024;
     788+       bcm947xx_parts[4].size   = 128*1024;
    579789+
    580790+       /* nvram (read-only) */
    581 +       bcm947xx_parts[6].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
    582 +       bcm947xx_parts[6].size   = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
     791+       bcm947xx_parts[5].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
     792+       bcm947xx_parts[5].size   = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
    583793+
    584794+       /* linux (kernel and rootfs) */
    … …  
    587797+               bcm947xx_parts[3].size + mtd->erasesize;
    588798+       bcm947xx_parts[1].size   = size - bcm947xx_parts[0].size -
    589 +               bcm947xx_parts[3].size - bcm947xx_parts[5].size -
     799+               bcm947xx_parts[3].size - bcm947xx_parts[4].size -
    590800+               mtd->erasesize;
    591801+
    … …  
    593803+       if (find_root(mtd,size,&bcm947xx_parts[2])==0) {
    594804+               /* entirely jffs2 */
    595 +               bcm947xx_parts[4].name = NULL;
     805+               bcm947xx_parts[6].name = NULL;
    596806+               bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -
    597 +                               bcm947xx_parts[3].size - bcm947xx_parts[5].size;
     807+                               bcm947xx_parts[4].size - bcm947xx_parts[5].size;
    598808+       } else {
    599809+               /* legacy setup */
    600810+               /* calculate leftover flash, and assign it to the jffs2 partition */
    601 +               bcm947xx_parts[4].offset = bcm947xx_parts[2].offset +
     811+               bcm947xx_parts[6].offset = bcm947xx_parts[2].offset +
    602812+                       bcm947xx_parts[2].size;
    603 +               if ((bcm947xx_parts[4].offset % mtd->erasesize) > 0) {
    604 +                       bcm947xx_parts[4].offset += mtd->erasesize -
    605 +                               (bcm947xx_parts[4].offset % mtd->erasesize);
     813+               if ((bcm947xx_parts[6].offset % mtd->erasesize) > 0) {
     814+                       bcm947xx_parts[6].offset += mtd->erasesize -
     815+                               (bcm947xx_parts[6].offset % mtd->erasesize);
    606816+               }
    607 +               bcm947xx_parts[4].size = bcm947xx_parts[5].offset -
    608 +                       bcm947xx_parts[4].offset;
     817+               bcm947xx_parts[6].size = bcm947xx_parts[4].offset -
     818+                       bcm947xx_parts[6].offset;
    609819+       }
    610820+       return bcm947xx_parts;
    … …  
    709919+module_init(init_bcm947xx_map);
    710920+module_exit(cleanup_bcm947xx_map);
    711 diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in linux-2.4.32-freewrt/drivers/mtd/maps/Config.in
    712 --- linux-2.4.32/drivers/mtd/maps/Config.in     2003-06-13 16:51:34.000000000 +0200
    713 +++ linux-2.4.32-freewrt/drivers/mtd/maps/Config.in     2006-09-16 21:25:49.000000000 +0200
    714 @@ -48,6 +48,8 @@
    715  fi
    716  
    717  if [ "$CONFIG_MIPS" = "y" ]; then
    718 +   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
    719 +   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX board for Netgear WGT634u' CONFIG_MTD_BCM947XX_NETGEAR $CONFIG_MTD_CFI
    720     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
    721     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
    722     dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
    723 diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile linux-2.4.32-freewrt/drivers/mtd/maps/Makefile
    724 --- linux-2.4.32/drivers/mtd/maps/Makefile      2003-06-13 16:51:34.000000000 +0200
    725 +++ linux-2.4.32-freewrt/drivers/mtd/maps/Makefile      2006-09-16 21:25:17.000000000 +0200
    726 @@ -3,6 +3,8 @@
    727  #
    728  # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
    729  
    730 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
    731 +
    732  BELOW25                := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
    733  
    734  ifeq ($(BELOW25),y)
    735 @@ -10,6 +12,8 @@
    736  endif
    737  
    738  # Chip mappings
    739 +obj-$(CONFIG_MTD_BCM947XX)     += bcm947xx-flash.o
    740 +obj-$(CONFIG_MTD_BCM947XX_NETGEAR)     += bcm947xx-netgear-flash.o
    741  obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
    742  obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
    743  obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o
     921diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-netgear-flash.c.orig linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-netgear-flash.c.orig
Note: See TracChangeset for help on using the changeset viewer.