aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/etrax
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
commit64fbade9399c6413439be939f0c92ebb2724ee87 (patch)
treea175d1e8ee566b98852ee7f43b310fbd018aaf0f /target/linux/etrax
parent7cf4e9f00a6f07393344d0b56ed02c61f5867c9f (diff)
downloadupstream-64fbade9399c6413439be939f0c92ebb2724ee87.tar.gz
upstream-64fbade9399c6413439be939f0c92ebb2724ee87.tar.bz2
upstream-64fbade9399c6413439be939f0c92ebb2724ee87.zip
refresh patches
SVN-Revision: 15581
Diffstat (limited to 'target/linux/etrax')
-rw-r--r--target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch26
-rw-r--r--target/linux/etrax/patches-2.6.29/200-samsung_flash.patch12
-rw-r--r--target/linux/etrax/patches-2.6.29/201-flashsize.patch20
-rw-r--r--target/linux/etrax/patches-2.6.29/300-sysfs.patch4
-rw-r--r--target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch8
-rw-r--r--target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch16
-rw-r--r--target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch14
7 files changed, 41 insertions, 59 deletions
diff --git a/target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch b/target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch
index 6495c4957f..bf43914f73 100644
--- a/target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch
+++ b/target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch
@@ -1,7 +1,6 @@
-diff -urN linux-2.6.28.clean/arch/cris/Makefile linux-2.6.28.mod/arch/cris/Makefile
---- linux-2.6.28.clean/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.mod/arch/cris/Makefile 2009-04-07 11:52:30.000000000 +0200
-@@ -40,7 +40,7 @@
+--- a/arch/cris/Makefile
++++ b/arch/cris/Makefile
+@@ -40,7 +40,7 @@ endif
LD = $(CROSS_COMPILE)ld -mcrislinux
@@ -10,9 +9,8 @@ diff -urN linux-2.6.28.clean/arch/cris/Makefile linux-2.6.28.mod/arch/cris/Makef
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
-diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/Makefile
---- linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/Makefile 2009-04-07 11:55:01.000000000 +0200
+--- a/arch/cris/arch-v10/boot/Makefile
++++ b/arch/cris/arch-v10/boot/Makefile
@@ -2,8 +2,6 @@
# arch/cris/arch-v10/boot/Makefile
#
@@ -22,7 +20,7 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/a
subdir- := compressed rescue
targets := Image
-@@ -13,7 +11,7 @@
+@@ -13,7 +11,7 @@ $(obj)/Image: vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
@@ -31,10 +29,9 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/a
$(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@
-diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/compressed/Makefile
---- linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/compressed/Makefile 2009-04-07 11:53:02.000000000 +0200
-@@ -6,7 +6,6 @@
+--- a/arch/cris/arch-v10/boot/compressed/Makefile
++++ b/arch/cris/arch-v10/boot/compressed/Makefile
+@@ -6,7 +6,6 @@ asflags-y += $(LINUXINCLUDE)
ccflags-y += -O2 $(LINUXINCLUDE)
ldflags-y += -T $(srctree)/$(src)/decompress.lds
OBJECTS = $(obj)/head.o $(obj)/misc.o
@@ -42,9 +39,8 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile linux-2
quiet_cmd_image = BUILD $@
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/rescue/Makefile
---- linux-2.6.28.clean/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/rescue/Makefile 2009-04-07 11:53:09.000000000 +0200
+--- a/arch/cris/arch-v10/boot/rescue/Makefile
++++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -5,7 +5,6 @@
ccflags-y += -O2 $(LINUXINCLUDE)
asflags-y += $(LINUXINCLUDE)
diff --git a/target/linux/etrax/patches-2.6.29/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.29/200-samsung_flash.patch
index 5df6590fa7..d04c2794d4 100644
--- a/target/linux/etrax/patches-2.6.29/200-samsung_flash.patch
+++ b/target/linux/etrax/patches-2.6.29/200-samsung_flash.patch
@@ -1,10 +1,8 @@
-Index: linux-2.6.28.2/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.28.2.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2009-02-04 13:42:19.000000000 +0100
-+++ linux-2.6.28.2/drivers/mtd/chips/cfi_cmdset_0002.c 2009-02-04 13:44:11.000000000 +0100
-@@ -364,7 +364,7 @@
- return NULL;
- }
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+
+ cfi_fixup_major_minor(cfi, extp);
- if (extp->MajorVersion != '1' ||
+ if (extp->MajorVersion < '1' || extp->MajorVersion > '3' ||
diff --git a/target/linux/etrax/patches-2.6.29/201-flashsize.patch b/target/linux/etrax/patches-2.6.29/201-flashsize.patch
index e825acf1f7..42a467f749 100644
--- a/target/linux/etrax/patches-2.6.29/201-flashsize.patch
+++ b/target/linux/etrax/patches-2.6.29/201-flashsize.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
-===================================================================
---- linux-2.6.28.2.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2009-02-04 13:49:34.000000000 +0100
-+++ linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c 2009-02-04 13:55:30.000000000 +0100
-@@ -113,7 +113,7 @@
+--- a/arch/cris/arch-v10/drivers/axisflashmap.c
++++ b/arch/cris/arch-v10/drivers/axisflashmap.c
+@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
/* If no partition-table was found, we use this default-set. */
#define MAX_PARTITIONS 7
@@ -11,7 +9,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
/*
* Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
-@@ -122,19 +122,14 @@
+@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
*/
static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
{
@@ -36,7 +34,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
}
};
-@@ -281,6 +276,11 @@
+@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
struct partitiontable_entry *ptable;
int use_default_ptable = 1; /* Until proven otherwise. */
const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n";
@@ -48,7 +46,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
if (!(mymtd = flash_probe())) {
/* There's no reason to use this module if no flash chip can
-@@ -293,6 +293,31 @@
+@@ -293,6 +293,31 @@ static int __init init_axis_flash(void)
axisflash_mtd = mymtd;
}
@@ -80,10 +78,8 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
if (mymtd) {
mymtd->owner = THIS_MODULE;
ptable_head = (struct partitiontable_head *)(FLASH_CACHED_ADDR +
-Index: linux-2.6.28.2/arch/cris/arch-v10/lib/hw_settings.S
-===================================================================
---- linux-2.6.28.2.orig/arch/cris/arch-v10/lib/hw_settings.S 2009-02-04 13:48:25.000000000 +0100
-+++ linux-2.6.28.2/arch/cris/arch-v10/lib/hw_settings.S 2009-02-04 13:49:04.000000000 +0100
+--- a/arch/cris/arch-v10/lib/hw_settings.S
++++ b/arch/cris/arch-v10/lib/hw_settings.S
@@ -60,3 +60,5 @@
.dword R_PORT_PB_SET
.dword PB_SET_VALUE
diff --git a/target/linux/etrax/patches-2.6.29/300-sysfs.patch b/target/linux/etrax/patches-2.6.29/300-sysfs.patch
index 9f415b4a82..ffaec36758 100644
--- a/target/linux/etrax/patches-2.6.29/300-sysfs.patch
+++ b/target/linux/etrax/patches-2.6.29/300-sysfs.patch
@@ -8,7 +8,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op
+@@ -4393,6 +4394,7 @@ static const struct tty_operations rs_op
.tiocmset = rs_tiocmset
};
@@ -16,7 +16,7 @@
static int __init
rs_init(void)
{
-@@ -4518,6 +4520,24 @@ rs_init(void)
+@@ -4527,6 +4529,24 @@ rs_init(void)
#endif
#endif /* CONFIG_SVINTO_SIM */
diff --git a/target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch b/target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch
index d0fdbf5897..ed2bfe459f 100644
--- a/target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch
+++ b/target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.28.9/arch/cris/Kconfig
-===================================================================
---- linux-2.6.28.9.orig/arch/cris/Kconfig 2009-03-23 22:55:52.000000000 +0100
-+++ linux-2.6.28.9/arch/cris/Kconfig 2009-04-08 16:53:30.000000000 +0200
-@@ -662,6 +662,12 @@
+--- a/arch/cris/Kconfig
++++ b/arch/cris/Kconfig
+@@ -662,6 +662,12 @@ source "drivers/block/Kconfig"
source "drivers/ide/Kconfig"
diff --git a/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
index 7eed8b2a71..dc63165c5e 100644
--- a/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
+++ b/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
-===================================================================
---- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 09:30:40.000000000 +0100
-+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 21:23:12.000000000 +0100
-@@ -450,11 +450,18 @@
+--- a/arch/cris/arch-v10/drivers/Kconfig
++++ b/arch/cris/arch-v10/drivers/Kconfig
+@@ -450,11 +450,18 @@ config ETRAX_I2C
i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
@@ -22,7 +20,7 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Select whether to use the special I2C mode in the PB I/O register or
not. This option needs to be selected in order to use some drivers
-@@ -478,7 +485,7 @@
+@@ -478,7 +485,7 @@ config ETRAX_I2C_CLK_PORT
config ETRAX_I2C_EEPROM
bool "I2C EEPROM (non-volatile RAM) support"
@@ -31,10 +29,8 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
driver. Select size option: Probed, 2k, 8k, 16k.
-Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile
-===================================================================
---- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:30:41.000000000 +0100
-+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:35:39.000000000 +0100
+--- a/arch/cris/arch-v10/drivers/Makefile
++++ b/arch/cris/arch-v10/drivers/Makefile
@@ -4,6 +4,7 @@
obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
diff --git a/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch b/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
index 7ac24a474b..4032550661 100644
--- a/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
+++ b/target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.28.9/drivers/serial/crisv10.c
-===================================================================
---- linux-2.6.28.9.orig/drivers/serial/crisv10.c 2009-04-10 12:58:18.000000000 +0200
-+++ linux-2.6.28.9/drivers/serial/crisv10.c 2009-04-10 12:58:22.000000000 +0200
-@@ -28,12 +28,15 @@
+--- a/drivers/serial/crisv10.c
++++ b/drivers/serial/crisv10.c
+@@ -28,12 +28,15 @@ static char *serial_version = "$Revision
#include <linux/mutex.h>
#include <linux/bitops.h>
#include <linux/device.h>
@@ -20,7 +18,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#include <arch/svinto.h>
-@@ -457,7 +460,6 @@
+@@ -457,7 +460,6 @@ static struct e100_serial rs_table[] = {
#define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))
@@ -28,7 +26,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
static struct fast_timer fast_timers[NR_PORTS];
#endif
-@@ -4221,151 +4223,132 @@
+@@ -4221,151 +4223,132 @@ rs_open(struct tty_struct *tty, struct f
return 0;
}
@@ -249,7 +247,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
&serial_version[11]); /* "$Revision: x.yy" */
}
-@@ -4389,9 +4372,11 @@
+@@ -4389,9 +4372,11 @@ static const struct tty_operations rs_op
.break_ctl = rs_break,
.send_xchar = rs_send_xchar,
.wait_until_sent = rs_wait_until_sent,