aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/etrax
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commit8e67ddaccc3a73993df876497d9a55e8400b1306 (patch)
tree1ebdd84043c3a394d84a147696f72821da570290 /target/linux/etrax
parent113e9261575859ec79851119cbc0b3b4c18e87e1 (diff)
downloadupstream-8e67ddaccc3a73993df876497d9a55e8400b1306.tar.gz
upstream-8e67ddaccc3a73993df876497d9a55e8400b1306.tar.bz2
upstream-8e67ddaccc3a73993df876497d9a55e8400b1306.zip
kernel: update to 2.6.32.10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/etrax')
-rw-r--r--target/linux/etrax/Makefile2
-rw-r--r--target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch4
-rw-r--r--target/linux/etrax/patches-2.6.32/200-samsung_flash.patch2
-rw-r--r--target/linux/etrax/patches-2.6.32/300-usb_support.patch6
-rw-r--r--target/linux/etrax/patches-2.6.32/600-create-device-serial.patch6
5 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
index fd4615e664..875034cb68 100644
--- a/target/linux/etrax/Makefile
+++ b/target/linux/etrax/Makefile
@@ -10,7 +10,7 @@ ARCH:=cris
BOARD:=etrax
BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.32.9
+LINUX_VERSION:=2.6.32.10
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
index f837ff58fe..fbcb7fa05b 100644
--- a/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
+++ b/target/linux/etrax/patches-2.6.32/100-cris-makefiles.patch
@@ -49,5 +49,5 @@
-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
- CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
-
+ KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
+ KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
diff --git a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
index 4176ec3950..eab03db50d 100644
--- a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
+++ b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -385,7 +385,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
cfi_fixup_major_minor(cfi, extp);
diff --git a/target/linux/etrax/patches-2.6.32/300-usb_support.patch b/target/linux/etrax/patches-2.6.32/300-usb_support.patch
index 7b2972656a..0a0f81f98c 100644
--- a/target/linux/etrax/patches-2.6.32/300-usb_support.patch
+++ b/target/linux/etrax/patches-2.6.32/300-usb_support.patch
@@ -1,7 +1,7 @@
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
- obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
+@@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
+ obj-$(CONFIG_USB_XHCI_HCD) += xhci.o
obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
+obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o
@@ -10,7 +10,7 @@
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/
+@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/
obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/
obj-$(CONFIG_USB_ISP1760_HCD) += host/
diff --git a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
index 516b98471f..58817e0dec 100644
--- a/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
+++ b/target/linux/etrax/patches-2.6.32/600-create-device-serial.patch
@@ -1,6 +1,6 @@
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
-@@ -31,6 +31,7 @@ static char *serial_version = "$Revision
+@@ -32,6 +32,7 @@ static char *serial_version = "$Revision
#include <linux/module.h>
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -8,7 +8,7 @@
#include <asm/irq.h>
#include <asm/dma.h>
-@@ -4414,6 +4415,8 @@ static const struct tty_operations rs_op
+@@ -4415,6 +4416,8 @@ static const struct tty_operations rs_op
#endif
};
@@ -17,7 +17,7 @@
static int __init rs_init(void)
{
int i;
-@@ -4547,6 +4550,24 @@ static int __init rs_init(void)
+@@ -4548,6 +4551,24 @@ static int __init rs_init(void)
#endif
#endif /* CONFIG_SVINTO_SIM */