merge of '190b6a69d61b81a346fd716bd98a7dd4b0fdc441'

     and '8c2c64187790bfeb1b538bae3efe7832208261af'

6 files changed, 47 insertions, 43 deletions

diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index ddbc2da1a3..6ceb7622ac 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -10,7 +10,9 @@ squashfs/squashfs-lzma.patch
 squashfs/squashfs-Kconfig.patch
 squashfs/squashfs-Makefile.patch
 00-linux-2.6.20.1.patch
-01-fix-redboot-bad-code.patch
+01-fix-redboot-parse-oops.patch
+02-fix-redboot-parse-regression.patch
+03-improve-byteswap-redboot-parse.patch
 07-remove-avila-ixdp425-setup.patch
 08-avila-loft-setup.patch
 09-avila-setup-pata.patch
@@ -32,10 +34,12 @@ squashfs/squashfs-Makefile.patch
 75-dsmg600-support.patch
 76-dsmg600-pwrbtn.patch
 78-velocity-BE.patch
-80-kexec-arm-r3.patch
+80-kexec-arm-upstream.patch
 85-nslu2-rtc-fixup.patch
 86-nas100d-rtc-fixup.patch
 87-dsmg600-rtc-fixup.patch
+89-dsmg600-mv-freq-fixup.patch
+89-nslu2-mv-freq-fixup.patch
 96-fsg3-support.patch
 98-sata_via-pata-support-upstream.patch
 99-avila-mtd-microcode.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 193e82f518..94a08509a7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "704"
+IXP4XX_KERNEL_SVN_REV = "768"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
index 948ccd6f70..e0a885fa0d 100644
--- a/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
+++ b/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
@@ -29,7 +29,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
 #
-CONFIG_LOCALVERSION="-moko7"
+CONFIG_LOCALVERSION="-moko8"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -165,9 +165,8 @@ CONFIG_S3C2410_BOOT_ERROR_RESET=y
 #
 CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
-CONFIG_S3C2410_PM_DEBUG=y
-CONFIG_S3C2410_PM_CHECK=y
-CONFIG_S3C2410_PM_CHECK_CHUNKSIZE=64
+# CONFIG_S3C2410_PM_DEBUG is not set
+# CONFIG_S3C2410_PM_CHECK is not set
 CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
 
 #
@@ -639,8 +638,8 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
 CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_NAND_S3C2410=y
 CONFIG_MTD_NAND_S3C2410_BBT=y
-CONFIG_MTD_NAND_S3C2410_DEBUG=y
-# CONFIG_MTD_NAND_S3C2410_HWECC is not set
+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
+CONFIG_MTD_NAND_S3C2410_HWECC=y
 CONFIG_MTD_NAND_S3C2410_CLKSTOP=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@@ -761,7 +760,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # PHY device support
@@ -848,7 +847,8 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_KEYBOARD_GTA01=m
+CONFIG_KEYBOARD_GTA01=y
+CONFIG_KEYBOARD_QT2410=y
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
@@ -881,6 +881,7 @@ CONFIG_SERIO=y
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
+CONFIG_NR_TTY_DEVICES=4
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_SERIAL_NONSTANDARD is not set
@@ -898,8 +899,7 @@ CONFIG_SERIAL_S3C2410_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
 
 #
 # IPMI
@@ -1450,9 +1450,9 @@ CONFIG_USB_ETH_RNDIS=y
 #
 # MMC/SD Card support
 #
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MMC_S3C=m
 
@@ -1558,6 +1558,16 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_YAFFS_FS is not set
+# CONFIG_YAFFS_YAFFS1 is not set
+# CONFIG_YAFFS_DOES_ECC is not set
+# CONFIG_YAFFS_YAFFS2 is not set
+# CONFIG_YAFFS_AUTO_YAFFS2 is not set
+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
+# CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS is not set
+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
+# CONFIG_YAFFS_SHORT_NAMES_IN_RAM is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
diff --git a/packages/linux/linux-gta01_2.6.20.bb b/packages/linux/linux-gta01_2.6.20.bb
index a922abd701..406369d81f 100644
--- a/packages/linux/linux-gta01_2.6.20.bb
+++ b/packages/linux/linux-gta01_2.6.20.bb
@@ -4,7 +4,7 @@ AUTHOR = "Harald Welte <laforge@openmoko.org>"
 HOMEPAGE = "N/A"
 LICENSE = "GPL"
 DEPENDS += "uboot-gta01"
-MOKOR = "moko7"
+MOKOR = "moko8"
 PR = "${MOKOR}-r1"
 
 VANILLA_VERSION = "2.6.20"
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
index 1e59cecc9d..b73b227220 100644
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
+++ b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
@@ -1,47 +1,37 @@
-Index: linux-2.6.20.1/drivers/mtd/maps/physmap.c
+Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
 ===================================================================
---- linux-2.6.20.1.orig/drivers/mtd/maps/physmap.c	2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/mtd/maps/physmap.c	2007-02-26 02:05:28.000000000 +0100
-@@ -134,13 +134,53 @@
+--- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c	2007-03-06 01:06:56.000000000 +0100
++++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c	2007-03-06 01:12:35.000000000 +0100
+@@ -134,13 +134,43 @@
  	}
  	info->mtd->owner = THIS_MODULE;
  
 +static struct mtd_partition TS101_partitions[] = {
 +	{
-+	  .name = "U-Boot",
++	  .name = "u-boot",
 +	  .offset = 0x00F00000,
 +	  .size = 0x00040000,
 +	  .mask_flags = MTD_WRITEABLE,  /* force read-only */
 +	},
 +	{
-+	  .name = "Kernel",             /* default kernel image */
++	  .name = "kernel",             /* default kernel image */
 +	  .offset = 0x00000000,
-+	  .size = 0x00200000,
++	  .size = 0x00280000,
 +	},
 +	{
-+	  .name = "RootFS1",
-+	  .offset = 0x00200000,
-+	  .size = 0x00900000,
++	  .name = "rootfs",
++	  .offset = 0x00280000,
++	  .size = 0x00C80000,
 +	},
 +	{
-+	  .name = "RootFS2",
-+	  .offset = 0x00b00000,
-+	  .size = 0x00300000,
-+	},
-+	{
-+	  .name = "Vendor",
-+	  .offset = 0x00E00000,
-+	  .size = 0x00100000,
-+	},
-+	{
-+	  .name = "U-Boot Config",
++	  .name = "empty",
 +	  .offset = 0x00F40000,
-+	  .size = 0x00020000,
++	  .size = 0x000A0000,
 +	},
 +	{
-+	  .name = "NAS Config",
-+	  .offset = 0x00F60000,
-+	  .size = 0x000A0000,
++	  .name = "u-boot env",
++	  .offset = 0x00FE0000,
++	  .size = 0x00020000,
 +	}
 +};
 +
@@ -53,7 +43,7 @@ Index: linux-2.6.20.1/drivers/mtd/maps/physmap.c
  		return 0;
  	}
 -
-+	physmap_set_partitions(TS101_partitions, 7);
++	physmap_set_partitions(TS101_partitions, 5);
  	if (physmap_data->nr_parts) {
  		printk(KERN_NOTICE "Using physmap partition information\n");
  		add_mtd_partitions(info->mtd, physmap_data->parts,
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb
index 38b607e65b..6e08b9ecff 100644
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ b/packages/linux/linux-turbostation_2.6.20.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
 DEPENDS = "uboot-utils"
-PR = "r3"
+PR = "r4"
 
 # notes on iom def kernel:
 #