enable cfgfs and atm

- make cfgfs work for ag241
- split mtd to separate package to control dependencies
- update linux-atm package to latest upstream
- enable atm kernel module building

4 files changed, 57 insertions, 18 deletions

diff --git a/target/Config.in b/target/Config.in
index 7fcc049fd..2ff9ce4dd 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -557,7 +557,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	  create an read-only initramfs system.
 
 config ADK_TARGET_ROOTFS_SQUASHFS
-	bool "squashfs read-only root filesystem"
+	bool "Compressed read-only root filesystem (squashfs)"
+	select ADK_KERNEL_SQUASHFS
 	depends on \
 		ADK_LINUX_CRIS_FOXBOARD || \
 		ADK_LINUX_MIPS_AG241 || \
diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch
index a09ea1c18..8b28e854c 100644
--- a/target/ag241/patches/ar7.patch
+++ b/target/ag241/patches/ar7.patch
@@ -76,6 +76,40 @@ diff -Nur linux-2.6.32.orig/arch/mips/kernel/traps.c linux-2.6.32/arch/mips/kern
  	}
  	return (void *)old_handler;
  }
+diff -Nur linux-2.6.32.orig/drivers/mtd/ar7part.c linux-2.6.32/drivers/mtd/ar7part.c
+--- linux-2.6.32.orig/drivers/mtd/ar7part.c	2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/drivers/mtd/ar7part.c	2009-12-17 10:51:32.044434005 +0100
+@@ -28,7 +28,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/magic.h>
+ 
+-#define AR7_PARTS	4
++#define AR7_PARTS	5
+ #define ROOT_OFFSET	0xe0000
+ 
+ #define LOADER_MAGIC1	le32_to_cpu(0xfeedfa42)
+@@ -122,14 +122,19 @@
+ 
+ 	ar7_parts[2].name = "linux";
+ 	ar7_parts[2].offset = pre_size;
+-	ar7_parts[2].size = master->size - pre_size - post_size;
++	ar7_parts[2].size = master->size - pre_size - post_size - 2*master->erasesize;
+ 	ar7_parts[2].mask_flags = 0;
+ 
+ 	ar7_parts[3].name = "rootfs";
+ 	ar7_parts[3].offset = root_offset;
+-	ar7_parts[3].size = master->size - root_offset - post_size;
++	ar7_parts[3].size = master->size - root_offset - post_size - 2*master->erasesize;
+ 	ar7_parts[3].mask_flags = 0;
+ 
++	ar7_parts[4].name = "cfgfs";
++	ar7_parts[4].offset = master->size - 2*master->erasesize;
++	ar7_parts[4].size = 2*master->erasesize;
++	ar7_parts[4].mask_flags = 0;
++
+ 	*pparts = ar7_parts;
+ 	return AR7_PARTS;
+ }
 diff -Nur linux-2.6.32.orig/drivers/mtd/maps/physmap.c linux-2.6.32/drivers/mtd/maps/physmap.c
 --- linux-2.6.32.orig/drivers/mtd/maps/physmap.c	2009-12-03 04:51:21.000000000 +0100
 +++ linux-2.6.32/drivers/mtd/maps/physmap.c	2009-12-16 20:12:01.388510102 +0100
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index a9c2668ae..8631b486e 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -17,6 +17,10 @@ config ADK_KPACKAGE_KMOD_EXPORTFS
 	default n
 	help
 
+config ADK_KERNEL_SQUASHFS
+	boolean
+	default n
+
 config ADK_KERNEL_EXT2_FS
 	boolean
 	default n
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 349f4a9fd..05995b8b2 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -40,23 +40,23 @@ config ADK_KERNEL_LLC
 	tristate
 	default n
 
-#config ADK_KPACKAGE_KMOD_ATM
-#	prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)"
-#	tristate
-#	default n
-#	help
-#	 ATM is a high-speed networking technology for Local Area Networks
-#	 and Wide Area Networks.  It uses a fixed packet size and is
-#	 connection oriented, allowing for the negotiation of minimum
-#	 bandwidth requirements.
-#
-#	 In order to participate in an ATM network, your Linux box needs an
-#	 ATM networking card. If you have that, say Y here and to the driver
-#	 of your ATM card below.
-#
-#	 Note that you need a set of user-space programs to actually make use
-#	 of ATM.  See the file <file:Documentation/networking/atm.txt> for
-#	 further details.
+config ADK_KPACKAGE_KMOD_ATM
+	prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)"
+	tristate
+	default n
+	help
+	 ATM is a high-speed networking technology for Local Area Networks
+	 and Wide Area Networks.  It uses a fixed packet size and is
+	 connection oriented, allowing for the negotiation of minimum
+	 bandwidth requirements.
+
+	 In order to participate in an ATM network, your Linux box needs an
+	 ATM networking card. If you have that, say Y here and to the driver
+	 of your ATM card below.
+
+	 Note that you need a set of user-space programs to actually make use
+	 of ATM.  See the file <file:Documentation/networking/atm.txt> for
+	 further details.
 
 config ADK_KPACKAGE_KMOD_BRIDGE
 	prompt "kmod-net-bridge................... 802.1d Ethernet Bridging"