Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 23 insertions, 9 deletions

diff --git a/target/Config.in b/target/Config.in
index 58cd64178..c16235f3e 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -259,6 +259,9 @@ config ADK_LINUX_MIPS64_LEMOTE
 	bool "Lemote Subnotebook Yeeloong"
 	select ADK_lemote
 	select ADK_LINUX_64
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_NETDEVICES
@@ -269,6 +272,8 @@ config ADK_LINUX_MIPS64_LEMOTE
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_PCI
+	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
 	  Lemote Subnotebook.
 	  http://www.lemote.com/english/index.html
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index e93f13b4a..ec09c0716 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -41,9 +41,9 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 ifeq ($(FS),encrypted)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinitcrypt
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
 	@echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFUSERSTARBALL)"
 	@echo 'Boot your lemote via NFS or USB.'
 	@echo 'Then create at least three partitions with fdisk:'
 	@echo '/dev/sda1 (ext2)'
diff --git a/target/lemote/files/boot/boot.cfg b/target/lemote/files/boot/boot.cfg
index 63f740928..2f67fe67b 100644
--- a/target/lemote/files/boot/boot.cfg
+++ b/target/lemote/files/boot/boot.cfg
@@ -3,5 +3,5 @@ default 0
 showmenu 1
 
 title Linux
-	kernel /dev/fs/ext2@wd0/boot/lemote-mips-kernel
+	kernel /dev/fs/ext2@wd0/boot/lemote-encrypted-kernel
 	args no_auto_cmd root=/dev/mapper/root resume=/dev/mapper/swap
diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config
index a8e30edc9..29731d812 100644
--- a/target/lemote/kernel.config
+++ b/target/lemote/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33
-# Sat Feb 27 10:09:18 2010
+# Sun Feb 28 16:36:49 2010
 #
 CONFIG_MIPS=y
 
@@ -544,7 +544,7 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
 # CONFIG_SATA_PMP is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -697,7 +697,11 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
-# CONFIG_WLAN is not set
+CONFIG_WLAN=y
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1084,6 +1088,8 @@ CONFIG_STAGING=y
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192E is not set
 # CONFIG_INPUT_MIMIO is not set
 # CONFIG_TRANZPORT is not set
 
@@ -1099,6 +1105,8 @@ CONFIG_STAGING=y
 # CONFIG_B3DFG is not set
 # CONFIG_IDE_PHISON is not set
 # CONFIG_PLAN9AUTH is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_VME_BUS is not set
 
@@ -1110,6 +1118,7 @@ CONFIG_STAGING=y
 # CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
 CONFIG_FB_SM7XX=y
 # CONFIG_FB_SM7XX_ACCEL is not set
 
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index bf72a1cff..986d9627e 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -18,7 +18,7 @@ config ADK_KPACKAGE_KMOD_USB
 	tristate
 	default y if ADK_LINUX_X86_ALIX1C
 	default n
-	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD)
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXBOARD || ADK_LINUX_MIPS64_LEMOTE )
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_USB_DEVICEFS
 	help
diff --git a/target/native/target.mk b/target/native/target.mk
index cc22ace9b..5667e46e4 100644
--- a/target/native/target.mk
+++ b/target/native/target.mk
@@ -1,6 +1,6 @@
 ARCH:=			$(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_64//")
 CPU_ARCH:=		$(shell uname -m)
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe