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

4 files changed, 30 insertions, 16 deletions

diff --git a/target/cris/Makefile b/target/cris/Makefile
index 0ddfb0fcb..52417225e 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -21,8 +21,8 @@ kernel-install: tools-compile
 	PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 
 ${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
-        cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
-            >${BUILD_DIR}/${ROOTFSSQUASHFS}
+	cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
+		>${BUILD_DIR}/${ROOTFSSQUASHFS}
 
 ifeq ($(ADK_TARGET_FS),squashfs)
 imageinstall: kernel-install $(BUILD_DIR)/$(ROOTFSSQUASHFS)
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 0d4d6f7af..26ac067b1 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -2,7 +2,7 @@ menu "Bluetooth"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI
 
 config ADK_KPACKAGE_KMOD_BT
-	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
+	prompt "kmod-bt.................... Bluetooth drivers and network stack"
 	tristate
 	default n
 	help
@@ -22,9 +22,9 @@ config ADK_KPACKAGE_KMOD_BT
 	     CMTP Module (CAPI Message Transport Protocol)
 	     HIDP Module (Human Interface Device Protocol)
 
-config ADK_KPACKAGE_KMOD_BT_L2CAP
-	prompt "kmod-bluetooth-l2cap.............. L2CAP protocol support"
-	tristate
+config ADK_KERNEL_BT_L2CAP
+	prompt "........................... L2CAP protocol support"
+	boolean
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
 	help
@@ -33,9 +33,9 @@ config ADK_KPACKAGE_KMOD_BT_L2CAP
 	  support is required for most Bluetooth applications.
 
 
-config ADK_KPACKAGE_KMOD_BT_SCO
-	prompt "kmod-bluetooth-sco................ SCO links support"
-	tristate
+config ADK_KERNEL_BT_SCO
+	prompt "........................... SCO links support"
+	boolean
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
 	help
@@ -43,7 +43,7 @@ config ADK_KPACKAGE_KMOD_BT_SCO
 	  required for voice applications like Headset and Audio.
 
 config ADK_KPACKAGE_KMOD_BT_RFCOMM
-	prompt "kmod-bluetooth-rfcomm............. RFCOMM protocol support"
+	prompt "kmod-bt-rfcomm............. RFCOMM protocol support"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -54,7 +54,7 @@ config ADK_KPACKAGE_KMOD_BT_RFCOMM
 	  applications.
 
 config ADK_KPACKAGE_KMOD_BT_BNEP
-	prompt "kmod-bluetooth-bnep............... BNEP protocol support"
+	prompt "kmod-bt-bnep............... BNEP protocol support"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -65,7 +65,7 @@ config ADK_KPACKAGE_KMOD_BT_BNEP
 	  Bluetooth PAN (Personal Area Network).
 
 config ADK_KPACKAGE_KMOD_BT_HIDP
-	prompt "kmod-bluetooth-hidp............... HIDP protocol support"
+	prompt "kmod-bt-hidp............... HIDP protocol support"
 	tristate
 	default n
 	select ADK_KERNEL_INPUT
@@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_BT_HIDP
 	  Interface Device Profile.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
-	prompt "kmod-bluetooth-hci-usb............ HCI USB driver"
+	prompt "kmod-bt-hci-usb............ HCI USB driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -88,7 +88,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	  USB interface.
 
 config ADK_KPACKAGE_KMOD_BT_HCIUART
-	prompt "kmod-bluetooth-hci-uart........... HCI UART driver"
+	prompt "kmod-bt-hci-uart........... HCI UART driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -100,7 +100,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART
 	  adapter and BrainBoxes Bluetooth PC Card.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
-	prompt "kmod-bluetooth-hci-bcm203x........ HCI BCM203x USB driver"
+	prompt "kmod-bt-hci-bcm203x........ HCI BCM203x USB driver"
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_FW_LOADER
@@ -112,7 +112,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
 	  Blutonium based devices.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBPA10X
-	prompt "kmod-bluetooth-hci-bpa10x......... HCI BPA10x USB driver"
+	prompt "kmod-bt-hci-bpa10x......... HCI BPA10x USB driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ede84a73a..4df34a2bc 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -185,6 +185,8 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	depends on !ADK_KERNEL_XFS_FS
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
 	default n
 	help
 	  XFS is a high performance journaling filesystem which originated
diff --git a/target/linux/patches/2.6.39/cris-thread-macro.patch b/target/linux/patches/2.6.39/cris-thread-macro.patch
new file mode 100644
index 000000000..717b31636
--- /dev/null
+++ b/target/linux/patches/2.6.39/cris-thread-macro.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.39.orig/arch/cris/include/asm/thread_info.h linux-2.6.39/arch/cris/include/asm/thread_info.h
+--- linux-2.6.39.orig/arch/cris/include/asm/thread_info.h	2011-05-19 06:06:34.000000000 +0200
++++ linux-2.6.39/arch/cris/include/asm/thread_info.h	2011-06-28 13:07:09.712682140 +0200
+@@ -68,7 +68,7 @@
+ #define init_thread_info	(init_thread_union.thread_info)
+ 
+ /* thread information allocation */
+-#define alloc_thread_info(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
++#define alloc_thread_info_node(tsk, node) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
+ #define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
+ 
+ #endif /* !__ASSEMBLY__ */