diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2010-11-04 14:18:45 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2010-11-04 14:18:45 +0000 |
| commit | a85e3d60c56831285103773c9853d99620c716ae (patch) | |
| tree | 46808ec6bebf2c7701a423100acbfb1ad429375e /target | |
| parent | d917b7d1ef2d6cae78263e9715084f54493afff4 (diff) | |
| download | upstream-a85e3d60c56831285103773c9853d99620c716ae.tar.gz upstream-a85e3d60c56831285103773c9853d99620c716ae.tar.bz2 upstream-a85e3d60c56831285103773c9853d99620c716ae.zip | |
upgrade to 2.6.36
SVN-Revision: 23867
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/avr32/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/avr32/config-default | 3 | ||||
| -rw-r--r-- | target/linux/avr32/patches/001-use_generic_syscall_defines.patch | 36 |
3 files changed, 39 insertions, 2 deletions
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 5e495c5b3f..62d249610e 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.25 +LINUX_VERSION:=2.6.36 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/config-default b/target/linux/avr32/config-default index 9f15a0ac3e..edd646dd47 100644 --- a/target/linux/avr32/config-default +++ b/target/linux/avr32/config-default @@ -17,9 +17,10 @@ CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 CONFIG_ATMEL_TCLIB=y CONFIG_AVR32=y CONFIG_BITREVERSE=y -CONFIG_BOARD_ATNGW100=y CONFIG_BOARD_ATNGW100_ADDON_NONE=y # CONFIG_BOARD_ATNGW100_EVKLCD10X is not set +CONFIG_BOARD_ATNGW100_MKI=y +# CONFIG_BOARD_ATNGW100_MKII is not set # CONFIG_BOARD_ATNGW100_MRMT is not set # CONFIG_BOARD_ATSTK1000 is not set # CONFIG_BOARD_FAVR_32 is not set diff --git a/target/linux/avr32/patches/001-use_generic_syscall_defines.patch b/target/linux/avr32/patches/001-use_generic_syscall_defines.patch new file mode 100644 index 0000000000..a3b7041d3b --- /dev/null +++ b/target/linux/avr32/patches/001-use_generic_syscall_defines.patch @@ -0,0 +1,36 @@ +From e9c8bb3f2bf792fd63f3ab2e1f5333267d1155fe Mon Sep 17 00:00:00 2001 +From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> +Date: Wed, 3 Nov 2010 10:25:45 +0100 +Subject: [PATCH 1/1] avr32: use generic syscall defines instead of arch specific + +This patch removes the duplicated syscall function defines in syscalls.h and +relies on the generic defines in the asm-generic directory. This fix makes +AVR32 architecture compile again, as the duplicated syscalls.h functions came +in conflict with other patches. + +Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> +--- + arch/avr32/include/asm/syscalls.h | 9 --------- + 1 files changed, 0 insertions(+), 9 deletions(-) + +--- a/arch/avr32/include/asm/syscalls.h ++++ b/arch/avr32/include/asm/syscalls.h +@@ -16,18 +16,9 @@ + #include <linux/signal.h> + + /* kernel/process.c */ +-asmlinkage int sys_fork(struct pt_regs *); + asmlinkage int sys_clone(unsigned long, unsigned long, + unsigned long, unsigned long, + struct pt_regs *); +-asmlinkage int sys_vfork(struct pt_regs *); +-asmlinkage int sys_execve(const char __user *, char __user *__user *, +- char __user *__user *, struct pt_regs *); +- +-/* kernel/signal.c */ +-asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *, +- struct pt_regs *); +-asmlinkage int sys_rt_sigreturn(struct pt_regs *); + + /* mm/cache.c */ + asmlinkage int sys_cacheflush(int, void __user *, size_t); |