hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove duplicate code 

SVN-Revision: 2729
owl
Waldemar Brodkorb 2005-12-18 23:48:55 +00:00
parent 4933ece49f
commit a86a6a9705
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openwrt/target/linux/linux-2.6/patches/brcm/002-flash-map.patch
View File

@ -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 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/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 +++ linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c 2005-12-19 00:33:31.276241000 +0100
@@ -0,0 +1,321 @@ @@ -0,0 +1,316 @@
+/* +/*
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) + * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org> + * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@ -226,14 +226,9 @@ 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) { + if (find_root(mtd,size,&bcm947xx_parts[2])==0) {
+ /* entirely jffs2 */ + /* entirely jffs2 */
+ bcm947xx_parts[4].name = NULL; + bcm947xx_parts[4].name = NULL;
+ if (cfe_size_flag == 0) {
+ bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - + bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -
+ bcm947xx_parts[3].size; + bcm947xx_parts[3].size;
+ } else { + } else {
+ bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -
+ bcm947xx_parts[3].size;
+ }
+ } else {
+ /* legacy setup */ + /* legacy setup */
+ /* calculate leftover flash, and assign it to the jffs2 partition */ + /* calculate leftover flash, and assign it to the jffs2 partition */
+ if (cfe_size_flag == 0) { + if (cfe_size_flag == 0) {