Update to latest LKL.

.config

@@ -0,0 +1,206 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.22-rc7
+# Sat Dec 29 18:15:45 2007
+#
+# CONFIG_ISA is not set
+# CONFIG_ISAPNP is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_PCI is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_SMP is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_SPLIT_PTLOCK_CPUS=0
+# CONFIG_MMU is not set
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SYSFS is not set
+CONFIG_ZONE_DMA_FLAG=0x00
+# CONFIG_HAS_IOMEM is not set
+# CONFIG_TINY_SHMEM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_NO_HZ=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_LKL=y
+# CONFIG_LKL_ENV_NONE is not set
+# CONFIG_LKL_ENV_POSIX is not set
+# CONFIG_LKL_ENV_NT is not set
+# CONFIG_LKL_ENV_NTK is not set
+CONFIG_LKL_ENV_APR=y
+# CONFIG_LKL_ENV_LINUX is not set
+CONFIG_LKL_DRV_DISK=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_LSF 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_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"
+
+#
+# Networking
+#
+# CONFIG_NET is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+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
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_DMA=y

.gitignore

@@ -0,0 +1,8 @@
+*~
+*.o
+include/
+disk
+daemon.out
+lkl
+.deps
+include

Makefile

@@ -1,9 +1,9 @@
 #uncoment the next 2 lines to get LKL's file APIs. This currently works on linux only
 .PHONY=clean
-LKL_DEFINES+=-DLKL_FILE_APIS
-LKL=lkl/vmlinux
+LKL_DEFINES+=-DLKL_FILE_APIS -Iinclude
+LKL=$(CROSS)lkl/vmlinux $(CROSS)lkl/env.a
 
-APR_LIN_CFLAGS=`apr-config --includes --cppflags`
+APR_LIN_CFLAGS=$(shell apr-config --includes --cppflags)
 APR_WIN_CFLAGS=-Iapr_win/include/
 
 APR_LIN_LIB=-lapr-1
@@ -49,53 +49,49 @@ include/linux:
 	-$(MKDIR) `dirname $@`
 	ln -s $(LINUX)/include/linux include/linux
 
-%.config: $(LINUX)/arch/lkl/defconfig
-	-mkdir `dirname $@`
-	cp $^ $@
-
 INC=include/asm include/asm-generic include/asm-i386 include/linux
 
-lkl/vmlinux: lkl/.config drivers/*.c drivers/Makefile
-	cd $(LINUX) && \
-	$(MAKE) O=$(HERE)/`dirname $@` ARCH=lkl \
-		LKL_DRIVERS=$(HERE)/drivers \
-		vmlinux
+$(CROSS)lkl/.config: .config 
+	mkdir -p $(CROSS)lkl && \
+	cp $< $@
 
-lkl-nt/vmlinux: lkl-nt/.config
+$(CROSS)lkl/vmlinux: $(CROSS)lkl/.config 
 	cd $(LINUX) && \
-	$(MAKE) O=$(HERE)/`dirname $@` ARCH=lkl CROSS_COMPILE=i586-mingw32msvc- \
-		LKL_DRIVERS=$(HERE)/drivers \
-		vmlinux
-
-CFLAGS=-Wall -g -DFILE_DISK_MAJOR=42 $(LKL_DEFINES) $(CFLAGS_OS)
+	$(MAKE) O=$(HERE)/$(CROSS)lkl ARCH=lkl \
+	CROSS_COMPILE=$(CROSS) \
+	vmlinux
 
-syscalls.o: syscalls.c $(INC)
-	$(CC) -c $(CFLAGS) -Iinclude $< 
+$(CROSS)lkl/env.a: $(CROSS)lkl/.config 
+	cd $(LINUX) && \
+	$(MAKE) O=$(HERE)/$(CROSS)lkl ARCH=lkl \
+	CROSS_COMPILE=$(CROSS) \
+	EXTRA_CFLAGS="$(CFLAGS_OS)" \
+	env.a
 
+CFLAGS=-Wall -g $(CFLAGS_OS) $(LKL_DEFINES)
 
 %.o: %.c $(INC)
 	$(CC) -c $(CFLAGS) $< 
 
-
-AOUT=$(OBJS) lkl/vmlinux
-AEXE=$(OBJS) lkl-nt/vmlinux
+AOUT=$(OBJS) $(LKL) 
+AEXE=$(OBJS) $(LKL)
 
 clean:
-	-rm -rf daemon.out daemon.exe include 
-	-rm -rf *.o drivers/*.o drivers/built-in* 
-	-rm -rf drivers/.*.cmd .deps/ *~
+	-rm -rf daemon.out daemon.exe include *.o drivers/*.o drivers/built-in* drivers/.*.cmd .deps/ *~
 
 clean-all: clean
 	-rm -rf lkl lkl-nt
 
 TAGS: 
 	etags *.c drivers/*.c
 
-daemon.out: $(AOUT) $(INC) include/asm 
-	$(CC) $(CFLAGS) $(AOUT) $(APR_LIN_LIB) $(LUA_LIN_LIB) -o $@
+daemon.out: $(AOUT) $(INC) 
+	$(CC) $(AOUT) $(APR_LIN_LIB) $(LUA_LIN_LIB) -o $@
+
+daemon.exe: CROSS=i586-mingw32msvc-
 
-daemon.exe: $(AEXE) $(INC)
-	i586-mingw32msvc-gcc $(CFLAGS) $(AEXE) $(APR_WIN_LIB) $(LUA_WIN_LIB) -o $@
+daemon.exe: $(AEXE) $(INC) 
+	$(CROSS)gcc $(AEXE) $(APR_WIN_LIB) $(LUA_WIN_LIB) -o $@
 
 .deps/%.d: %.c
 	mkdir -p .deps/$(dir $<)