From d411d3a66cd8d76056d39a61d0b58da4abbacb6c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Jan 2009 20:11:45 +0000 Subject: kernel-headers: bump 2.6.27 / 2.6.28 to latest stable --- toolchain/kernel-headers/Config.in | 4 +- .../linux-2.6.28.1-cris-headers.patch | 28 ----------- .../linux-2.6.28.1-cris-objcopy-flags.patch | 45 ------------------ .../linux-2.6.28.1-fix-serial.h-include.patch | 55 ---------------------- .../linux-2.6.28.2-cris-headers.patch | 28 +++++++++++ .../linux-2.6.28.2-cris-objcopy-flags.patch | 45 ++++++++++++++++++ .../linux-2.6.28.2-fix-serial.h-include.patch | 55 ++++++++++++++++++++++ 7 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch delete mode 100644 toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch delete mode 100644 toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch create mode 100644 toolchain/kernel-headers/linux-2.6.28.2-cris-headers.patch create mode 100644 toolchain/kernel-headers/linux-2.6.28.2-cris-objcopy-flags.patch create mode 100644 toolchain/kernel-headers/linux-2.6.28.2-fix-serial.h-include.patch (limited to 'toolchain/kernel-headers') diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 03008ac38..2633e9a3a 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -117,7 +117,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.24.7" if BR2_KERNEL_HEADERS_2_6_24 default "2.6.25.19" if BR2_KERNEL_HEADERS_2_6_25 default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26 - default "2.6.27.12" if BR2_KERNEL_HEADERS_2_6_27 - default "2.6.28.1" if BR2_KERNEL_HEADERS_2_6_28 + default "2.6.27.13" if BR2_KERNEL_HEADERS_2_6_27 + default "2.6.28.2" if BR2_KERNEL_HEADERS_2_6_28 default "2.6" if BR2_KERNEL_HEADERS_SNAP diff --git a/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch b/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch deleted file mode 100644 index ff2fa49c5..000000000 --- a/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild 2009-01-12 12:59:06.000000000 +0100 -@@ -1,3 +1,5 @@ -+header-y += elf.h -+header-y += ptrace.h - header-y += user.h - header-y += svinto.h - header-y += sv_addr_ag.h -diff -urN linux-2.6.28/arch/cris/include/asm/Kbuild linux-2.6.28.my/arch/cris/include/asm/Kbuild ---- linux-2.6.28/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/include/asm/Kbuild 2009-01-12 13:14:40.000000000 +0100 -@@ -1,11 +1,13 @@ - include include/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ - -+header-y += elf.h - header-y += ethernet.h - header-y += rtc.h - header-y += sync_serial.h -+header-y += user.h - - unifdef-y += etraxgpio.h - unifdef-y += rs485.h diff --git a/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch b/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch deleted file mode 100644 index 32da2f087..000000000 --- a/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- linux-2.6.28/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/Makefile 2009-01-12 13:21:44.000000000 +0100 -@@ -40,7 +40,7 @@ - - LD = $(CROSS_COMPILE)ld -mcrislinux - --OBJCOPYFLAGS := -O binary -R .note -R .comment -S -+OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment - - CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) - -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile 2009-01-12 13:28:25.000000000 +0100 -@@ -2,8 +2,6 @@ - # arch/cris/arch-v10/boot/Makefile - # - --OBJCOPYFLAGS = -O binary --remove-section=.bss -- - subdir- := compressed rescue - targets := Image - -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile 2009-01-12 13:28:33.000000000 +0100 -@@ -6,7 +6,6 @@ - ccflags-y += -O2 $(LINUXINCLUDE) - ldflags-y += -T $(srctree)/$(src)/decompress.lds - OBJECTS = $(obj)/head.o $(obj)/misc.o --OBJCOPYFLAGS = -O binary --remove-section=.bss - - quiet_cmd_image = BUILD $@ - cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile 2009-01-12 13:28:40.000000000 +0100 -@@ -5,7 +5,6 @@ - ccflags-y += -O2 $(LINUXINCLUDE) - asflags-y += $(LINUXINCLUDE) - ldflags-y += -T $(srctree)/$(src)/rescue.lds --OBJCOPYFLAGS = -O binary --remove-section=.bss - obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o - OBJECT := $(obj)/head.o - diff --git a/toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch b/toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch deleted file mode 100644 index f6504aaab..000000000 --- a/toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 60c20fb8c00a2b23308ae4517f145383bc66d291 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft -Date: Fri, 2 Jan 2009 13:49:04 +0000 -Subject: [PATCH] serial: RS485 ioctl structure uses __u32 include linux/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -In the commit below a new struct serial_rs485 was introduced for a new -ioctl: - - commit c26c56c0f40e200e61d1390629c806f6adaffbcc - Author: Alan Cox - Date: Mon Oct 13 10:37:48 2008 +0100 - - tty: Cris has a nice RS485 ioctl so we should steal it - -This structure uses the __u32 types for some of its members, which leads -to the following compile error: - - $ cc -I.../include -c X.c - In file included from X.c:2: .../include/linux/serial.h:185: - error: expected specifier-qualifier-list before ‘__u32’ - $ - -It seems that these types are appropriate for this structure as it is -to be exposed to userspace. These types are available via linux/types.h -so move the include of that outside the __KERNEL__ section. - -Signed-off-by: Andy Whitcroft -Signed-off-by: Andrew Morton -Signed-off-by: Alan Cox -Signed-off-by: Linus Torvalds ---- - include/linux/serial.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/include/linux/serial.h b/include/linux/serial.h -index 1ea8d92..9136cc5 100644 ---- a/include/linux/serial.h -+++ b/include/linux/serial.h -@@ -10,8 +10,9 @@ - #ifndef _LINUX_SERIAL_H - #define _LINUX_SERIAL_H - --#ifdef __KERNEL__ - #include -+ -+#ifdef __KERNEL__ - #include - - /* --- -1.5.6.5 - diff --git a/toolchain/kernel-headers/linux-2.6.28.2-cris-headers.patch b/toolchain/kernel-headers/linux-2.6.28.2-cris-headers.patch new file mode 100644 index 000000000..ff2fa49c5 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.28.2-cris-headers.patch @@ -0,0 +1,28 @@ +diff -urN linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild +--- linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild 2009-01-12 12:59:06.000000000 +0100 +@@ -1,3 +1,5 @@ ++header-y += elf.h ++header-y += ptrace.h + header-y += user.h + header-y += svinto.h + header-y += sv_addr_ag.h +diff -urN linux-2.6.28/arch/cris/include/asm/Kbuild linux-2.6.28.my/arch/cris/include/asm/Kbuild +--- linux-2.6.28/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/include/asm/Kbuild 2009-01-12 13:14:40.000000000 +0100 +@@ -1,11 +1,13 @@ + include include/asm-generic/Kbuild.asm + +-header-y += arch-v10/ +-header-y += arch-v32/ ++header-y += ../arch-v10/arch/ ++header-y += ../arch-v32/arch/ + ++header-y += elf.h + header-y += ethernet.h + header-y += rtc.h + header-y += sync_serial.h ++header-y += user.h + + unifdef-y += etraxgpio.h + unifdef-y += rs485.h diff --git a/toolchain/kernel-headers/linux-2.6.28.2-cris-objcopy-flags.patch b/toolchain/kernel-headers/linux-2.6.28.2-cris-objcopy-flags.patch new file mode 100644 index 000000000..32da2f087 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.28.2-cris-objcopy-flags.patch @@ -0,0 +1,45 @@ +--- linux-2.6.28/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/Makefile 2009-01-12 13:21:44.000000000 +0100 +@@ -40,7 +40,7 @@ + + LD = $(CROSS_COMPILE)ld -mcrislinux + +-OBJCOPYFLAGS := -O binary -R .note -R .comment -S ++OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment + + CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) + +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile 2009-01-12 13:28:25.000000000 +0100 +@@ -2,8 +2,6 @@ + # arch/cris/arch-v10/boot/Makefile + # + +-OBJCOPYFLAGS = -O binary --remove-section=.bss +- + subdir- := compressed rescue + targets := Image + +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile 2009-01-12 13:28:33.000000000 +0100 +@@ -6,7 +6,6 @@ + ccflags-y += -O2 $(LINUXINCLUDE) + ldflags-y += -T $(srctree)/$(src)/decompress.lds + OBJECTS = $(obj)/head.o $(obj)/misc.o +-OBJCOPYFLAGS = -O binary --remove-section=.bss + + quiet_cmd_image = BUILD $@ + cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile 2009-01-12 13:28:40.000000000 +0100 +@@ -5,7 +5,6 @@ + ccflags-y += -O2 $(LINUXINCLUDE) + asflags-y += $(LINUXINCLUDE) + ldflags-y += -T $(srctree)/$(src)/rescue.lds +-OBJCOPYFLAGS = -O binary --remove-section=.bss + obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o + OBJECT := $(obj)/head.o + diff --git a/toolchain/kernel-headers/linux-2.6.28.2-fix-serial.h-include.patch b/toolchain/kernel-headers/linux-2.6.28.2-fix-serial.h-include.patch new file mode 100644 index 000000000..f6504aaab --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.28.2-fix-serial.h-include.patch @@ -0,0 +1,55 @@ +From 60c20fb8c00a2b23308ae4517f145383bc66d291 Mon Sep 17 00:00:00 2001 +From: Andy Whitcroft +Date: Fri, 2 Jan 2009 13:49:04 +0000 +Subject: [PATCH] serial: RS485 ioctl structure uses __u32 include linux/types.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +In the commit below a new struct serial_rs485 was introduced for a new +ioctl: + + commit c26c56c0f40e200e61d1390629c806f6adaffbcc + Author: Alan Cox + Date: Mon Oct 13 10:37:48 2008 +0100 + + tty: Cris has a nice RS485 ioctl so we should steal it + +This structure uses the __u32 types for some of its members, which leads +to the following compile error: + + $ cc -I.../include -c X.c + In file included from X.c:2: .../include/linux/serial.h:185: + error: expected specifier-qualifier-list before ‘__u32’ + $ + +It seems that these types are appropriate for this structure as it is +to be exposed to userspace. These types are available via linux/types.h +so move the include of that outside the __KERNEL__ section. + +Signed-off-by: Andy Whitcroft +Signed-off-by: Andrew Morton +Signed-off-by: Alan Cox +Signed-off-by: Linus Torvalds +--- + include/linux/serial.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/include/linux/serial.h b/include/linux/serial.h +index 1ea8d92..9136cc5 100644 +--- a/include/linux/serial.h ++++ b/include/linux/serial.h +@@ -10,8 +10,9 @@ + #ifndef _LINUX_SERIAL_H + #define _LINUX_SERIAL_H + +-#ifdef __KERNEL__ + #include ++ ++#ifdef __KERNEL__ + #include + + /* +-- +1.5.6.5 + -- cgit v1.2.3