summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/cris/Makefile4
-rw-r--r--target/linux/config/Config.in.fs2
-rw-r--r--target/linux/patches/2.6.39/cris-thread-macro.patch12
3 files changed, 16 insertions, 2 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.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__ */