qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 21:09:53 +02:00
Code

[amazon] refresh kernel patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11194 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2008-05-19 06:34:16 +00:00
parent 6f76947712
commit bba1f99712
7 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/amazon/patches/017-wdt-driver.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.21.5/drivers/char/watchdog/Makefile.orig 2007-08-05 11:13:29.177013987 +0200 Index: linux-2.6.21.7/drivers/char/watchdog/Makefile
+++ linux-2.6.21.5/drivers/char/watchdog/Makefile 2007-08-05 11:13:52.190325445 +0200 ===================================================================
@@ -74,6 +74,7 @@ --- linux-2.6.21.7.orig/drivers/char/watchdog/Makefile
+++ linux-2.6.21.7/drivers/char/watchdog/Makefile
@@ -74,6 +74,7 @@ obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
# MIPS Architecture # MIPS Architecture
obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o

30
target/linux/amazon/patches/100-board.patch
View File

@ -1,7 +1,8 @@
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig Index: linux-2.6.21.7/arch/mips/Kconfig
--- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 ===================================================================
+++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 --- linux-2.6.21.7.orig/arch/mips/Kconfig
@@ -145,6 +145,17 @@ +++ linux-2.6.21.7/arch/mips/Kconfig
@@ -159,6 +159,17 @@ config BASLER_EXCITE_PROTOTYPE
note that a kernel built with this option selected will not be note that a kernel built with this option selected will not be
able to run on normal units. able to run on normal units.
@ -19,7 +20,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
config MIPS_COBALT config MIPS_COBALT
bool "Cobalt Server" bool "Cobalt Server"
select DMA_NONCOHERENT select DMA_NONCOHERENT
@@ -766,6 +776,7 @@ @@ -823,6 +834,7 @@ config TOSHIBA_RBTX4938
endchoice endchoice
@ -27,10 +28,11 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
source "arch/mips/ddb5xxx/Kconfig" source "arch/mips/ddb5xxx/Kconfig"
source "arch/mips/gt64120/ev64120/Kconfig" source "arch/mips/gt64120/ev64120/Kconfig"
source "arch/mips/jazz/Kconfig" source "arch/mips/jazz/Kconfig"
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile Index: linux-2.6.21.7/arch/mips/Makefile
--- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 ===================================================================
+++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 --- linux-2.6.21.7.orig/arch/mips/Makefile
@@ -267,6 +267,13 @@ +++ linux-2.6.21.7/arch/mips/Makefile
@@ -267,6 +267,13 @@ libs-$(CONFIG_MIPS_XXS1500) += arch/mips
load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
# #
@ -44,10 +46,11 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
# Cobalt Server # Cobalt Server
# #
core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h Index: linux-2.6.21.7/include/asm-mips/bootinfo.h
--- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 ===================================================================
+++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 --- linux-2.6.21.7.orig/include/asm-mips/bootinfo.h
@@ -212,6 +212,12 @@ +++ linux-2.6.21.7/include/asm-mips/bootinfo.h
@@ -213,6 +213,12 @@
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
@ -60,4 +63,3 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
#define CL_SIZE COMMAND_LINE_SIZE #define CL_SIZE COMMAND_LINE_SIZE
const char *get_system_type(void); const char *get_system_type(void);

8
target/linux/amazon/patches/110-char_drivers.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.21.5/drivers/char/Makefile Index: linux-2.6.21.7/drivers/char/Makefile
=================================================================== ===================================================================
--- linux-2.6.21.5.orig/drivers/char/Makefile 2007-06-24 07:44:10.606341712 +0200 --- linux-2.6.21.7.orig/drivers/char/Makefile
+++ linux-2.6.21.5/drivers/char/Makefile 2007-06-24 07:44:46.633864696 +0200 +++ linux-2.6.21.7/drivers/char/Makefile
@@ -103,6 +103,7 @@ @@ -103,6 +103,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/
obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
obj-$(CONFIG_TCG_TPM) += tpm/ obj-$(CONFIG_TCG_TPM) += tpm/

8
target/linux/amazon/patches/130-mtd_drivers.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.21.5/drivers/mtd/maps/Makefile Index: linux-2.6.21.7/drivers/mtd/maps/Makefile
=================================================================== ===================================================================
--- linux-2.6.21.5.orig/drivers/mtd/maps/Makefile 2007-06-24 07:55:22.138253344 +0200 --- linux-2.6.21.7.orig/drivers/mtd/maps/Makefile
+++ linux-2.6.21.5/drivers/mtd/maps/Makefile 2007-06-24 07:56:58.207648576 +0200 +++ linux-2.6.21.7/drivers/mtd/maps/Makefile
@@ -72,3 +72,4 @@ @@ -72,3 +72,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_TQM834x) += tqm834x.o obj-$(CONFIG_MTD_TQM834x) += tqm834x.o

8
target/linux/amazon/patches/140-net_drivers.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.21.5/drivers/net/Makefile Index: linux-2.6.21.7/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.6.21.5.orig/drivers/net/Makefile 2007-06-24 09:03:20.308277264 +0200 --- linux-2.6.21.7.orig/drivers/net/Makefile
+++ linux-2.6.21.5/drivers/net/Makefile 2007-06-24 09:05:13.560060376 +0200 +++ linux-2.6.21.7/drivers/net/Makefile
@@ -219,3 +219,5 @@ @@ -219,3 +219,5 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/ obj-$(CONFIG_FS_ENET) += fs_enet/
obj-$(CONFIG_NETXEN_NIC) += netxen/ obj-$(CONFIG_NETXEN_NIC) += netxen/

6
target/linux/amazon/patches/150-serial_driver.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.21.5/drivers/serial/Makefile Index: linux-2.6.21.7/drivers/serial/Makefile
=================================================================== ===================================================================
--- linux-2.6.21.5.orig/drivers/serial/Makefile 2007-06-24 10:51:45.005412992 +0200 --- linux-2.6.21.7.orig/drivers/serial/Makefile
+++ linux-2.6.21.5/drivers/serial/Makefile 2007-06-24 10:51:54.885910928 +0200 +++ linux-2.6.21.7/drivers/serial/Makefile
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
# #

9
target/linux/amazon/patches/160-cfi-swap.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.21.5/drivers/mtd/chips/cfi_cmdset_0002.c 2007-07-23 23:15:50.403369508 +0200 Index: linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.21.5.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-07-23 23:26:43.028560499 +0200 ===================================================================
@@ -1007,7 +1007,9 @@ --- linux-2.6.21.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-2.6.21.7/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1007,7 +1007,9 @@ static int __xipram do_write_oneword(str
int ret = 0; int ret = 0;
map_word oldd; map_word oldd;
int retry_cnt = 0; int retry_cnt = 0;
@ -11,4 +13,3 @@
adr += chip->start; adr += chip->start;
spin_lock(chip->mutex); spin_lock(chip->mutex);