linux-gta01: update to moko8 patchset

2 files changed, 23 insertions, 13 deletions

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"