update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly
SVN-Revision: 10137
This commit is contained in:
		@@ -1,7 +1,8 @@
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/Config.in linux-2.4.32-squashfs3.0/fs/Config.in
 | 
			
		||||
--- linux-2.4.32/fs/Config.in	2004-11-17 11:54:21.000000000 +0000
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/Config.in	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
@@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
 | 
			
		||||
Index: linux-2.4.35.4/fs/Config.in
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-2.4.35.4.orig/fs/Config.in	2007-12-15 05:19:42.758857728 +0100
 | 
			
		||||
+++ linux-2.4.35.4/fs/Config.in	2007-12-15 05:19:48.635192599 +0100
 | 
			
		||||
@@ -51,6 +51,14 @@
 | 
			
		||||
    int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
 | 
			
		||||
 fi
 | 
			
		||||
 tristate 'Compressed ROM file system support' CONFIG_CRAMFS
 | 
			
		||||
@@ -16,10 +17,11 @@ diff --new-file -urp linux-2.4.32/fs/Config.in linux-2.4.32-squashfs3.0/fs/Confi
 | 
			
		||||
 bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
 | 
			
		||||
 define_bool CONFIG_RAMFS y
 | 
			
		||||
 
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/Makefile linux-2.4.32-squashfs3.0/fs/Makefile
 | 
			
		||||
--- linux-2.4.32/fs/Makefile	2004-02-18 13:36:31.000000000 +0000
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/Makefile	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS)	+= reiserfs
 | 
			
		||||
Index: linux-2.4.35.4/fs/Makefile
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-2.4.35.4.orig/fs/Makefile	2007-12-15 05:19:42.766858183 +0100
 | 
			
		||||
+++ linux-2.4.35.4/fs/Makefile	2007-12-15 05:19:48.639192828 +0100
 | 
			
		||||
@@ -65,6 +65,7 @@
 | 
			
		||||
 subdir-$(CONFIG_DEVPTS_FS)	+= devpts
 | 
			
		||||
 subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
 | 
			
		||||
 subdir-$(CONFIG_BEFS_FS)	+= befs
 | 
			
		||||
@@ -27,9 +29,10 @@ diff --new-file -urp linux-2.4.32/fs/Makefile linux-2.4.32-squashfs3.0/fs/Makefi
 | 
			
		||||
 subdir-$(CONFIG_JFS_FS)		+= jfs
 | 
			
		||||
 subdir-$(CONFIG_XFS_FS)		+= xfs
 | 
			
		||||
 
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-squashfs3.0/fs/squashfs/inode.c
 | 
			
		||||
--- linux-2.4.32/fs/squashfs/inode.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/squashfs/inode.c	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/fs/squashfs/inode.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/fs/squashfs/inode.c	2007-12-15 05:19:48.647193283 +0100
 | 
			
		||||
@@ -0,0 +1,2028 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -2059,9 +2062,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/inode.c linux-2.4.32-squashfs3.0/f
 | 
			
		||||
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 | 
			
		||||
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 | 
			
		||||
+MODULE_LICENSE("GPL");
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-squashfs3.0/fs/squashfs/Makefile
 | 
			
		||||
--- linux-2.4.32/fs/squashfs/Makefile	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/squashfs/Makefile	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/fs/squashfs/Makefile
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/fs/squashfs/Makefile	2007-12-15 05:19:48.651193513 +0100
 | 
			
		||||
@@ -0,0 +1,11 @@
 | 
			
		||||
+#
 | 
			
		||||
+# Makefile for the linux squashfs routines.
 | 
			
		||||
@@ -2074,9 +2078,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/Makefile linux-2.4.32-squashfs3.0/
 | 
			
		||||
+obj-m := $(O_TARGET)
 | 
			
		||||
+
 | 
			
		||||
+include $(TOPDIR)/Rules.make
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs2_0.c linux-2.4.32-squashfs3.0/fs/squashfs/squashfs2_0.c
 | 
			
		||||
--- linux-2.4.32/fs/squashfs/squashfs2_0.c	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/squashfs/squashfs2_0.c	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c	2007-12-15 05:19:48.655193739 +0100
 | 
			
		||||
@@ -0,0 +1,751 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -2829,9 +2834,10 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs2_0.c linux-2.4.32-squashf
 | 
			
		||||
+
 | 
			
		||||
+	return 1;
 | 
			
		||||
+}
 | 
			
		||||
diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs.h linux-2.4.32-squashfs3.0/fs/squashfs/squashfs.h
 | 
			
		||||
--- linux-2.4.32/fs/squashfs/squashfs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/fs/squashfs/squashfs.h	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/fs/squashfs/squashfs.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/fs/squashfs/squashfs.h	2007-12-15 05:19:48.659193968 +0100
 | 
			
		||||
@@ -0,0 +1,85 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * Squashfs - a compressed read only filesystem for Linux
 | 
			
		||||
@@ -2918,10 +2924,11 @@ diff --new-file -urp linux-2.4.32/fs/squashfs/squashfs.h linux-2.4.32-squashfs3.
 | 
			
		||||
+	return 0;
 | 
			
		||||
+}
 | 
			
		||||
+#endif
 | 
			
		||||
diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/include/linux/fs.h
 | 
			
		||||
--- linux-2.4.32/include/linux/fs.h	2005-04-04 02:42:20.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/include/linux/fs.h	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
@@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
 | 
			
		||||
Index: linux-2.4.35.4/include/linux/fs.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-2.4.35.4.orig/include/linux/fs.h	2007-12-15 05:19:42.794859778 +0100
 | 
			
		||||
+++ linux-2.4.35.4/include/linux/fs.h	2007-12-15 05:19:48.663194197 +0100
 | 
			
		||||
@@ -324,6 +324,7 @@
 | 
			
		||||
 #include <linux/usbdev_fs_i.h>
 | 
			
		||||
 #include <linux/jffs2_fs_i.h>
 | 
			
		||||
 #include <linux/cramfs_fs_sb.h>
 | 
			
		||||
@@ -2929,7 +2936,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
 | 
			
		||||
 
 | 
			
		||||
 /*
 | 
			
		||||
  * Attribute flags.  These should be or-ed together to figure out what
 | 
			
		||||
@@ -519,6 +520,7 @@ struct inode {
 | 
			
		||||
@@ -519,6 +520,7 @@
 | 
			
		||||
 		struct socket			socket_i;
 | 
			
		||||
 		struct usbdev_inode_info        usbdev_i;
 | 
			
		||||
 		struct jffs2_inode_info		jffs2_i;
 | 
			
		||||
@@ -2937,7 +2944,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
 | 
			
		||||
 		void				*generic_ip;
 | 
			
		||||
 	} u;
 | 
			
		||||
 };
 | 
			
		||||
@@ -734,6 +736,7 @@ struct nameidata {
 | 
			
		||||
@@ -734,6 +736,7 @@
 | 
			
		||||
 #include <linux/usbdev_fs_sb.h>
 | 
			
		||||
 #include <linux/cramfs_fs_sb.h>
 | 
			
		||||
 #include <linux/jffs2_fs_sb.h>
 | 
			
		||||
@@ -2945,7 +2952,7 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
 | 
			
		||||
 
 | 
			
		||||
 extern struct list_head super_blocks;
 | 
			
		||||
 extern spinlock_t sb_lock;
 | 
			
		||||
@@ -793,6 +796,7 @@ struct super_block {
 | 
			
		||||
@@ -793,6 +796,7 @@
 | 
			
		||||
 		struct usbdev_sb_info   usbdevfs_sb;
 | 
			
		||||
 		struct jffs2_sb_info	jffs2_sb;
 | 
			
		||||
 		struct cramfs_sb_info	cramfs_sb;
 | 
			
		||||
@@ -2953,9 +2960,10 @@ diff --new-file -urp linux-2.4.32/include/linux/fs.h linux-2.4.32-squashfs3.0/in
 | 
			
		||||
 		void			*generic_sbp;
 | 
			
		||||
 	} u;
 | 
			
		||||
 	/*
 | 
			
		||||
diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs.h
 | 
			
		||||
--- linux-2.4.32/include/linux/squashfs_fs.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs.h	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/include/linux/squashfs_fs.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/include/linux/squashfs_fs.h	2007-12-15 05:19:48.663194197 +0100
 | 
			
		||||
@@ -0,0 +1,915 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS
 | 
			
		||||
+#define SQUASHFS_FS
 | 
			
		||||
@@ -3872,9 +3880,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs.h linux-2.4.32-squas
 | 
			
		||||
+
 | 
			
		||||
+#endif
 | 
			
		||||
+#endif
 | 
			
		||||
diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_i.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_i.h
 | 
			
		||||
--- linux-2.4.32/include/linux/squashfs_fs_i.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_i.h	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h	2007-12-15 05:19:48.663194197 +0100
 | 
			
		||||
@@ -0,0 +1,44 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS_I
 | 
			
		||||
+#define SQUASHFS_FS_I
 | 
			
		||||
@@ -3920,9 +3929,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_i.h linux-2.4.32-squ
 | 
			
		||||
+	} u;
 | 
			
		||||
+};
 | 
			
		||||
+#endif
 | 
			
		||||
diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_sb.h linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_sb.h
 | 
			
		||||
--- linux-2.4.32/include/linux/squashfs_fs_sb.h	1970-01-01 01:00:00.000000000 +0100
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/include/linux/squashfs_fs_sb.h	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
 | 
			
		||||
+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h	2007-12-15 05:19:48.667194423 +0100
 | 
			
		||||
@@ -0,0 +1,74 @@
 | 
			
		||||
+#ifndef SQUASHFS_FS_SB
 | 
			
		||||
+#define SQUASHFS_FS_SB
 | 
			
		||||
@@ -3998,9 +4008,10 @@ diff --new-file -urp linux-2.4.32/include/linux/squashfs_fs_sb.h linux-2.4.32-sq
 | 
			
		||||
+	int			(*read_fragment_index_table)(struct super_block *s);
 | 
			
		||||
+};
 | 
			
		||||
+#endif
 | 
			
		||||
diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init/do_mounts.c
 | 
			
		||||
--- linux-2.4.32/init/do_mounts.c	2003-11-28 18:26:21.000000000 +0000
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/init/do_mounts.c	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
Index: linux-2.4.35.4/init/do_mounts.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-2.4.35.4.orig/init/do_mounts.c	2007-12-15 05:19:42.822861373 +0100
 | 
			
		||||
+++ linux-2.4.35.4/init/do_mounts.c	2007-12-15 05:19:48.667194423 +0100
 | 
			
		||||
@@ -15,6 +15,7 @@
 | 
			
		||||
 #include <linux/minix_fs.h>
 | 
			
		||||
 #include <linux/ext2_fs.h>
 | 
			
		||||
@@ -4009,7 +4020,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
 | 
			
		||||
 #include <linux/cramfs_fs.h>
 | 
			
		||||
 
 | 
			
		||||
 #define BUILD_CRAMDISK
 | 
			
		||||
@@ -476,6 +477,7 @@ static int __init crd_load(int in_fd, in
 | 
			
		||||
@@ -476,6 +477,7 @@
 | 
			
		||||
  * 	minix
 | 
			
		||||
  * 	ext2
 | 
			
		||||
  *	romfs
 | 
			
		||||
@@ -4017,7 +4028,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
 | 
			
		||||
  *	cramfs
 | 
			
		||||
  * 	gzip
 | 
			
		||||
  */
 | 
			
		||||
@@ -486,6 +488,7 @@ identify_ramdisk_image(int fd, int start
 | 
			
		||||
@@ -486,6 +488,7 @@
 | 
			
		||||
 	struct minix_super_block *minixsb;
 | 
			
		||||
 	struct ext2_super_block *ext2sb;
 | 
			
		||||
 	struct romfs_super_block *romfsb;
 | 
			
		||||
@@ -4025,7 +4036,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
 | 
			
		||||
 	struct cramfs_super *cramfsb;
 | 
			
		||||
 	int nblocks = -1;
 | 
			
		||||
 	unsigned char *buf;
 | 
			
		||||
@@ -497,6 +500,7 @@ identify_ramdisk_image(int fd, int start
 | 
			
		||||
@@ -497,6 +500,7 @@
 | 
			
		||||
 	minixsb = (struct minix_super_block *) buf;
 | 
			
		||||
 	ext2sb = (struct ext2_super_block *) buf;
 | 
			
		||||
 	romfsb = (struct romfs_super_block *) buf;
 | 
			
		||||
@@ -4033,7 +4044,7 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
 | 
			
		||||
 	cramfsb = (struct cramfs_super *) buf;
 | 
			
		||||
 	memset(buf, 0xe5, size);
 | 
			
		||||
 
 | 
			
		||||
@@ -535,6 +539,15 @@ identify_ramdisk_image(int fd, int start
 | 
			
		||||
@@ -535,6 +539,15 @@
 | 
			
		||||
 		goto done;
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
@@ -4049,10 +4060,11 @@ diff --new-file -urp linux-2.4.32/init/do_mounts.c linux-2.4.32-squashfs3.0/init
 | 
			
		||||
 	/*
 | 
			
		||||
 	 * Read block 1 to test for minix and ext2 superblock
 | 
			
		||||
 	 */
 | 
			
		||||
diff --new-file -urp linux-2.4.32/lib/Config.in linux-2.4.32-squashfs3.0/lib/Config.in
 | 
			
		||||
--- linux-2.4.32/lib/Config.in	2003-11-28 18:26:21.000000000 +0000
 | 
			
		||||
+++ linux-2.4.32-squashfs3.0/lib/Config.in	2006-03-07 21:12:36.000000000 +0000
 | 
			
		||||
@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
 | 
			
		||||
Index: linux-2.4.35.4/lib/Config.in
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-2.4.35.4.orig/lib/Config.in	2007-12-15 05:19:42.830861829 +0100
 | 
			
		||||
+++ linux-2.4.35.4/lib/Config.in	2007-12-15 05:19:48.667194423 +0100
 | 
			
		||||
@@ -10,6 +10,7 @@
 | 
			
		||||
 # Do we need the compression support?
 | 
			
		||||
 #
 | 
			
		||||
 if [ "$CONFIG_CRAMFS" = "y" -o \
 | 
			
		||||
@@ -4060,7 +4072,7 @@ diff --new-file -urp linux-2.4.32/lib/Config.in linux-2.4.32-squashfs3.0/lib/Con
 | 
			
		||||
      "$CONFIG_PPP_DEFLATE" = "y" -o \
 | 
			
		||||
      "$CONFIG_CRYPTO_DEFLATE" = "y" -o \
 | 
			
		||||
      "$CONFIG_JFFS2_FS" = "y" -o \
 | 
			
		||||
@@ -17,6 +18,7 @@ if [ "$CONFIG_CRAMFS" = "y" -o \
 | 
			
		||||
@@ -17,6 +18,7 @@
 | 
			
		||||
    define_tristate CONFIG_ZLIB_INFLATE y
 | 
			
		||||
 else
 | 
			
		||||
   if [ "$CONFIG_CRAMFS" = "m" -o \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user