From: Claudio Mignanti <c.mignanti@gmail.com>
Date: Wed, 4 Feb 2009 06:16:16 +0000 (+0000)
Subject: Update and add patches
X-Git-Tag: reboot~24559
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=547cf0640653ef8097ebfb374764e780714330a3;p=openwrt%2Fstaging%2Fblogic.git

Update and add patches

SVN-Revision: 14403
---

diff --git a/target/linux/etrax/patches/013-crisdriver-sysfs.patch b/target/linux/etrax/patches/013-crisdriver-sysfs.patch
new file mode 100644
index 000000000000..c969468012dd
--- /dev/null
+++ b/target/linux/etrax/patches/013-crisdriver-sysfs.patch
@@ -0,0 +1,74 @@
+Index: linux-2.6.25.16/arch/cris/arch-v10/drivers/ds1302.c
+===================================================================
+--- linux-2.6.25.16.o/arch/cris/arch-v10/drivers/ds1302.c	2008-10-26 15:54:02.000000000 +0100
++++ linux-2.6.25.16/arch/cris/arch-v10/drivers/ds1302.c	2008-10-26 15:59:37.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/delay.h>
+ #include <linux/bcd.h>
+ #include <linux/capability.h>
++#include <linux/device.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+@@ -489,6 +490,10 @@
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_SYSFS
++static struct class *rtc_class;
++#endif
++
+ static int __init ds1302_register(void)
+ {
+ 	ds1302_init();
+@@ -497,6 +502,12 @@
+ 		       ds1302_name, RTC_MAJOR_NR);
+ 		return -1;
+ 	}
++	#ifdef CONFIG_SYSFS
++	rtc_class = class_create(THIS_MODULE, "rtc");
++	class_device_create(rtc_class, NULL, MKDEV(RTC_MAJOR_NR, 0),
++		NULL, "rtc");
++	#endif
++
+         return 0;
+ 
+ }
+Index: linux-2.6.25.16/arch/cris/arch-v10/drivers/gpio.c
+===================================================================
+--- linux-2.6.25.16.o/arch/cris/arch-v10/drivers/gpio.c	2008-10-26 15:56:28.000000000 +0100
++++ linux-2.6.25.16/arch/cris/arch-v10/drivers/gpio.c	2008-10-26 15:57:41.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <linux/poll.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
++#include <linux/device.h>
+ 
+ #include <asm/etraxgpio.h>
+ #include <asm/arch/svinto.h>
+@@ -768,6 +769,10 @@
+ 
+ /* main driver initialization routine, called from mem.c */
+ 
++#ifdef CONFIG_SYSFS
++static struct class *gpio_class;
++#endif
++
+ static int __init gpio_init(void)
+ {
+ 	int res;
+@@ -781,6 +786,13 @@
+ 		return res;
+ 	}
+ 
++#ifdef CONFIG_SYSFS
++	gpio_class = class_create(THIS_MODULE, "gpio");
++	class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
++	class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
++	class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 2), NULL, "leds");
++	class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
++#endif
+ 	/* Clear all leds */
+ #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
+ 	CRIS_LED_NETWORK_SET(0);
+
diff --git a/target/linux/etrax/patches/100-compile_fixes.patch b/target/linux/etrax/patches/100-compile_fixes.patch
index ecb930712b43..2a9fc6582c70 100644
--- a/target/linux/etrax/patches/100-compile_fixes.patch
+++ b/target/linux/etrax/patches/100-compile_fixes.patch
@@ -45,19 +45,19 @@
  
  quiet_cmd_image = BUILD   $@
  cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-@@ -22,10 +18,10 @@ $(obj)/decompress.bin: $(obj)/decompress
+@@ -21,12 +17,6 @@
+ $(obj)/decompress.bin: $(obj)/decompress.o FORCE
  	$(call if_changed,objcopy)
  
- $(obj)/head.o: $(obj)/head.S .config
+-$(obj)/head.o: $(obj)/head.S .config
 -	@$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
-+	@$(CC) -Iinclude  -D__ASSEMBLY__ -traditional -Wa,--em=criself -c $< -o $@
- 
- $(obj)/misc.o: $(obj)/misc.c .config
+-
+-$(obj)/misc.o: $(obj)/misc.c .config
 -	@$(CC) -D__KERNEL__ -c $< -o $@
-+	@$(CC) -Iinclude -D__KERNEL__ -Wa,--em=criself -c $< -o $@
- 
+-
  $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
  	$(call if_changed,image)
+ 
 --- a/arch/cris/arch-v10/boot/compressed/decompress.ld
 +++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
 @@ -1,4 +1,4 @@
diff --git a/target/linux/etrax/patches/400-Kconfig_source.patch b/target/linux/etrax/patches/400-Kconfig_source.patch
new file mode 100644
index 000000000000..8f5b1a5ae804
--- /dev/null
+++ b/target/linux/etrax/patches/400-Kconfig_source.patch
@@ -0,0 +1,16 @@
+Index: linux-2.6.25.20/arch/cris/Kconfig
+===================================================================
+--- linux-2.6.25.20.orig/arch/cris/Kconfig	2008-11-10 19:50:34.000000000 +0100
++++ linux-2.6.25.20/arch/cris/Kconfig	2009-01-30 13:03:46.000000000 +0100
+@@ -660,6 +660,10 @@
+ 
+ source "drivers/ide/Kconfig"
+ 
++source "drivers/scsi/Kconfig"
++
++source "drivers/media/Kconfig"
++
+ source "drivers/net/Kconfig"
+ 
+ source "drivers/i2c/Kconfig"
+
diff --git a/target/linux/etrax/patches/400-scsi_import.patch b/target/linux/etrax/patches/400-scsi_import.patch
deleted file mode 100644
index 497bbe29ffa5..000000000000
--- a/target/linux/etrax/patches/400-scsi_import.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp linux-2.6.25.16.ori/arch/cris/Kconfig linux-2.6.25.16/arch/cris/Kconfig
---- linux-2.6.25.16.ori/arch/cris/Kconfig	2008-10-13 21:43:04.000000000 +0200
-+++ linux-2.6.25.16/arch/cris/Kconfig	2008-10-13 21:53:56.000000000 +0200
-@@ -660,6 +660,8 @@ source "drivers/block/Kconfig"
- 
- source "drivers/ide/Kconfig"
- 
-+source "drivers/scsi/Kconfig"
-+
- source "drivers/net/Kconfig"
- 
- source "drivers/i2c/Kconfig"
-