diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-18 23:48:55 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-12-18 23:48:55 +0000 |
| commit | 1c9586ce00b46aba779011add8d3d3550b79cd15 (patch) | |
| tree | 8d7b4aa760f99115d1b0c2e2889590d917c51bc0 | |
| parent | 67bb52be2bad47218eb9240644df2eac2390ce2d (diff) | |
remove duplicate code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2729 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/linux-2.6/patches/brcm/002-flash-map.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/linux-2.6/patches/brcm/002-flash-map.patch b/target/linux/linux-2.6/patches/brcm/002-flash-map.patch index 3d85d8971..b8aeafa60 100644 --- a/target/linux/linux-2.6/patches/brcm/002-flash-map.patch +++ b/target/linux/linux-2.6/patches/brcm/002-flash-map.patch @@ -1,7 +1,7 @@ diff -Nur linux-2.6.15-rc5/drivers/mtd/maps/bcm47xx-flash.c linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c --- linux-2.6.15-rc5/drivers/mtd/maps/bcm47xx-flash.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c 2005-12-18 23:40:45.060006250 +0100 -@@ -0,0 +1,321 @@ ++++ linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c 2005-12-19 00:33:31.276241000 +0100 +@@ -0,0 +1,316 @@ +/* + * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) + * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org> @@ -226,13 +226,8 @@ diff -Nur linux-2.6.15-rc5/drivers/mtd/maps/bcm47xx-flash.c linux-2.6.15-rc5-fla + if (find_root(mtd,size,&bcm947xx_parts[2])==0) { + /* entirely jffs2 */ + bcm947xx_parts[4].name = NULL; -+ if (cfe_size_flag == 0) { -+ bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - -+ bcm947xx_parts[3].size; -+ } else { -+ bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - -+ bcm947xx_parts[3].size; -+ } ++ bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - ++ bcm947xx_parts[3].size; + } else { + /* legacy setup */ + /* calculate leftover flash, and assign it to the jffs2 partition */ |