LAB-kernel: Make LAB work in a 2.6.15 kernel.

2 files changed, 90 insertions, 130 deletions

diff --git a/packages/linux/LAB-kernel/h2200/defconfig b/packages/linux/LAB-kernel/h2200/defconfig
index 466c2072f5..b7f924e44d 100644
--- a/packages/linux/LAB-kernel/h2200/defconfig
+++ b/packages/linux/LAB-kernel/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-hh1
-# Thu Feb 16 14:58:20 2006
+# Linux kernel version: 2.6.15-hh1
+# Wed Feb 22 17:27:41 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -32,6 +33,10 @@ CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_MINIMAL_OOPS is not set
+CONFIG_INITRAMFS_SOURCE="initramfs_list"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -41,7 +46,6 @@ CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_SHMEM is not set
 CONFIG_USELIB=y
 CONFIG_CORE_DUMP=y
@@ -64,6 +68,23 @@ CONFIG_OBSOLETE_MODPARM=y
 CONFIG_KMOD=y
 
 #
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
 # System Type
 #
 # CONFIG_ARCH_CLPS7500 is not set
@@ -85,6 +106,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_AAEC2000 is not set
@@ -115,10 +137,10 @@ CONFIG_H2200_PM=y
 # CONFIG_MACH_T3XSCALE is not set
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_PXA25x=y
-CONFIG_PXA_KEYS=y
 # CONFIG_SA1100_H3100 is not set
 # CONFIG_SA1100_H3600 is not set
 # CONFIG_SA1100_H3800 is not set
+CONFIG_GPIO_KEYS=y
 
 #
 # Linux As Bootloader
@@ -165,7 +187,6 @@ CONFIG_LAB_RUN=y
 #
 CONFIG_CPU_32=y
 CONFIG_CPU_XSCALE=y
-# CONFIG_CPU_XSCALE_PXA250 is not set
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
@@ -174,7 +195,6 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 # Processor Features
 #
-# CONFIG_ARM_FASTCALL is not set
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
 
@@ -220,7 +240,6 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # PC-card bridges
 #
-# CONFIG_TCIC is not set
 CONFIG_PCMCIA_PXA2XX=y
 CONFIG_PCMCIA_H2200=y
 
@@ -236,6 +255,8 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -247,11 +268,6 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M"
 # CONFIG_XIP_KERNEL is not set
 
 #
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
 # Floating point emulation
 #
 
@@ -274,6 +290,8 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_APM=y
 
 #
@@ -304,8 +322,8 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 
@@ -318,15 +336,25 @@ CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 
 #
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK is not set
+
+#
 # IP: Netfilter Configuration
 #
 # CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_IPTABLES is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 
 #
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
@@ -342,8 +370,11 @@ CONFIG_NETFILTER=y
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 
 #
 # Network testing
@@ -352,6 +383,7 @@ CONFIG_NETFILTER=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
 
 #
 # Device Drivers
@@ -366,6 +398,11 @@ CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 
 #
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
 # Memory Technology Devices (MTD)
 #
 CONFIG_MTD=y
@@ -418,7 +455,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_RAMTD is not set
 # CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
@@ -442,6 +478,11 @@ CONFIG_MTD_NAND_HAMCOP=y
 # CONFIG_MTD_NAND_NANDSIM is not set
 
 #
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
 # Parallel port support
 #
 # CONFIG_PARPORT is not set
@@ -458,16 +499,7 @@ CONFIG_MTD_NAND_HAMCOP=y
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_ATA_OVER_ETH is not set
 
 #
@@ -500,6 +532,7 @@ CONFIG_IDE_GENERIC=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 
 #
@@ -530,6 +563,10 @@ CONFIG_NETDEVICES=y
 # CONFIG_TUN is not set
 
 #
+# PHY device support
+#
+
+#
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
@@ -550,7 +587,6 @@ CONFIG_NETDEVICES=y
 # Wireless LAN (non-hamradio)
 #
 # CONFIG_NET_RADIO is not set
-# CONFIG_HOSTAP is not set
 
 #
 # PCMCIA network device support
@@ -654,11 +690,9 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_ELV is not set
 CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
-# CONFIG_I2C_ISA is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
-# CONFIG_I2C_SENSOR is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -668,9 +702,11 @@ CONFIG_I2C_PXA=y
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCA9535 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -697,7 +733,6 @@ CONFIG_I2C_PXA=y
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_SA1100_RTC is not set
-# CONFIG_S3C2410_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -709,16 +744,21 @@ CONFIG_I2C_PXA=y
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
 # TPM devices
 #
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
 
 #
 # Hardware Monitoring support
 #
 # CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
 
 #
 # SoC drivers
@@ -743,6 +783,10 @@ CONFIG_H2200_BATTERY=y
 # CONFIG_MCP is not set
 
 #
+# Multimedia Capabilities Port drivers
+#
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -759,14 +803,13 @@ CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_IMAGEON is not set
+# CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_PXA is not set
 CONFIG_FB_MQ1100=y
-# CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -798,8 +841,8 @@ CONFIG_BACKLIGHT_H2200=y
 CONFIG_W1=y
 # CONFIG_W1_THERM is not set
 # CONFIG_W1_SMEM is not set
+# CONFIG_W1_DS2433 is not set
 CONFIG_W1_SAMCOP=y
-CONFIG_W1_SAMCOP_ONE_DEVICE=y
 CONFIG_W1_DS2760=y
 
 #
@@ -810,6 +853,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
 # USB Gadget Support
 #
 CONFIG_USB_GADGET=y
@@ -827,12 +874,11 @@ CONFIG_USB_PXA2XX_SMALL=y
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
-# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_ETH is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_G_CHAR is not set
+CONFIG_USB_G_CHAR=y
 
 #
 # MMC/SD Card support
@@ -862,10 +908,6 @@ CONFIG_EXT2_FS=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-
-#
-# XFS support
-#
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -874,6 +916,7 @@ CONFIG_INOTIFY=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -896,14 +939,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
-# CONFIG_DEVFS_DEBUG is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -919,6 +958,7 @@ CONFIG_RAMFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
@@ -951,6 +991,7 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1028,6 +1069,7 @@ CONFIG_NLS_UTF8=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_MAGIC_SYSRQ is not set
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_PREEMPT=y
@@ -1037,7 +1079,9 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
 CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
@@ -1086,6 +1130,7 @@ CONFIG_CRYPTO_DEFLATE=y
 # Library routines
 #
 CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
diff --git a/packages/linux/LAB-kernel/h2200/labrun.patch b/packages/linux/LAB-kernel/h2200/labrun.patch
deleted file mode 100644
index 29ff10eda2..0000000000
--- a/packages/linux/LAB-kernel/h2200/labrun.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: lab/lab-main.c
-===================================================================
-RCS file: /cvs/linux/kernel26/lab/lab-main.c,v
-retrieving revision 1.9
-diff -u -p -r1.9 lab-main.c
---- kernel26/lab/lab-main.c	22 Dec 2005 02:17:57 -0000	1.9
-+++ kernel26/lab/lab-main.c	16 Feb 2006 22:02:29 -0000
-@@ -18,7 +18,7 @@
- #include <linux/lab/lab.h>
- #include <linux/lab/commands.h>
- 
--
-+void lab_runfile(char *source, char *sourcefile);
- 
- int globfail;
- EXPORT_SYMBOL (globfail);
-@@ -67,7 +67,7 @@ static void parseargs (char *argstr, int
- 	while ((c = *argstr) != 0) {
- 		enum ParseState newState;
- 
--		if (c == ';' && lastState != PS_STRING && lastState != PS_ESCAPE)
-+		if ((c == ';' || c == '\n') && lastState != PS_STRING && lastState != PS_ESCAPE)
- 			break;
- 
- 		if (lastState == PS_ESCAPE) {
-@@ -106,7 +106,7 @@ static void parseargs (char *argstr, int
- 	if (argc_p != NULL)
- 		*argc_p = argc;
- 
--	if (*argstr == ';')
-+	if (*argstr == ';' || *argstr == '\n')
- 		*argstr++ = 0;
- 
- 	*resid = argstr;
-@@ -189,6 +189,7 @@ EXPORT_SYMBOL (lab_exec_string);
- 
- static char *blockdevs[] = {
- 	"/dev/mmc/blk0/part1", "ext2",
-+	"/dev/ide/host0/bus0/target0/lun0/part1", "ext2",
- 	"/dev/mtdblock/3", "jffs2",
- 	NULL
- };
-@@ -222,19 +223,19 @@ void lab_main (int cmdline)
- 		}
- 		lab_puts ("\r\n"
- 		          ">> Booting now.\r\n");
--		sys_mkdir("/fs", 0000);
-+		sys_mkdir("/mnt", 0000);
- 		sys_mount("/dev", "/dev", "devfs", 0, "");
- 		lab_puts (">> Looking for filesystems...\r\n");
- 		blockdev = blockdevs;
- 		while (*blockdev) {
- 			lab_printf("  >> Trying \"%s\"... ", blockdev[0]);
--			if (sys_mount(blockdev[0], "/fs", blockdev[1], MS_RDONLY, "") >= 0) {
-+			if (sys_mount(blockdev[0], "/mnt", blockdev[1], MS_RDONLY, "") >= 0) {
- 				struct stat sstat;
--				
-+
- 				lab_printf("ok");
--				if (sys_newstat("/fs/boot/zImage", &sstat) < 0) {
--					lab_printf(", but no zImage.\r\n");
--					sys_oldumount("/fs");
-+				if (sys_newstat("/mnt/boot/labrun", &sstat) < 0) {
-+					lab_printf(", but no labrun.\r\n");
-+					sys_oldumount("/mnt");
- 					blockdev += 2;
- 					continue;
- 				}
-@@ -249,12 +250,10 @@ void lab_main (int cmdline)
- 			lab_printf(">> No bootable filesystems found!\r\n");
- 			goto domenu;
- 		}
--		lab_printf(">> Copying zImage... ");
--		lab_copy("fs", "/fs/boot/zImage", "fs", "/zImage");
--		lab_printf("done\r\n>> Unmounting filesystem... ");
--		sys_oldumount("/fs");
--		lab_printf("done\r\n>> Booting kernel.\r\n");
--		lab_armboot("fs", "/zImage", NULL);
-+
-+		lab_printf(">> Executing labrun...\r\n");
-+		lab_runfile("fs", "/mnt/boot/labrun");
-+		lab_printf("done\r\n");
- 	}
- 
- domenu: