|
|
|
@ -1,6 +1,7 @@ |
|
|
|
|
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
|
|
|
|
--- linux.old/arch/mips/Kconfig 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/arch/mips/Kconfig 2007-01-26 00:51:18.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/arch/mips/Kconfig
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/arch/mips/Kconfig 2007-06-10 21:32:36.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/arch/mips/Kconfig 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -4,6 +4,10 @@
|
|
|
|
|
# Horrible source of confusion. Die, die, die ...
|
|
|
|
|
select EMBEDDED
|
|
|
|
@ -12,7 +13,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig |
|
|
|
|
mainmenu "Linux/MIPS Kernel Configuration"
|
|
|
|
|
|
|
|
|
|
menu "Machine selection"
|
|
|
|
|
@@ -240,6 +240,23 @@
|
|
|
|
|
@@ -126,6 +130,23 @@
|
|
|
|
|
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
|
|
|
|
Olivetti M700-10 workstations.
|
|
|
|
|
|
|
|
|
@ -36,9 +37,10 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig |
|
|
|
|
config LASAT
|
|
|
|
|
bool "LASAT Networks platforms"
|
|
|
|
|
select DMA_NONCOHERENT
|
|
|
|
|
diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
|
|
|
|
|
--- linux.old/arch/mips/kernel/cpu-probe.c 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/arch/mips/kernel/cpu-probe.c 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/arch/mips/kernel/cpu-probe.c 2007-06-10 21:32:13.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/arch/mips/kernel/cpu-probe.c 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -711,6 +711,28 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -78,9 +80,10 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu- |
|
|
|
|
case PRID_COMP_SANDCRAFT:
|
|
|
|
|
cpu_probe_sandcraft(c);
|
|
|
|
|
break;
|
|
|
|
|
diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
|
|
|
|
|
--- linux.old/arch/mips/kernel/proc.c 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/arch/mips/kernel/proc.c 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/arch/mips/kernel/proc.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/arch/mips/kernel/proc.c 2007-06-10 21:32:13.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/arch/mips/kernel/proc.c 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -83,6 +83,8 @@
|
|
|
|
|
[CPU_VR4181] = "NEC VR4181",
|
|
|
|
|
[CPU_VR4181A] = "NEC VR4181A",
|
|
|
|
@ -90,10 +93,11 @@ diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c |
|
|
|
|
[CPU_PR4450] = "Philips PR4450",
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
|
|
|
|
--- linux.old/arch/mips/Makefile 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/arch/mips/Makefile 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
@@ -576,6 +576,18 @@
|
|
|
|
|
Index: linux-2.6.22-rc4/arch/mips/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/arch/mips/Makefile 2007-06-10 21:32:56.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/arch/mips/Makefile 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -560,6 +560,18 @@
|
|
|
|
|
load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
@ -112,9 +116,10 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile |
|
|
|
|
# SNI RM
|
|
|
|
|
#
|
|
|
|
|
core-$(CONFIG_SNI_RM) += arch/mips/sni/
|
|
|
|
|
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
|
|
|
|
--- linux.old/arch/mips/mm/tlbex.c 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/arch/mips/mm/tlbex.c 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/arch/mips/mm/tlbex.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/arch/mips/mm/tlbex.c 2007-06-10 21:32:35.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/arch/mips/mm/tlbex.c 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -892,6 +892,8 @@
|
|
|
|
|
case CPU_4KSC:
|
|
|
|
|
case CPU_20KC:
|
|
|
|
@ -124,9 +129,10 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c |
|
|
|
|
tlbw(p);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
diff -urN linux.old/drivers/Kconfig linux.dev/drivers/Kconfig
|
|
|
|
|
--- linux.old/drivers/Kconfig 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/drivers/Kconfig 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/drivers/Kconfig
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/drivers/Kconfig 2007-06-10 21:32:13.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/drivers/Kconfig 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -56,6 +56,8 @@
|
|
|
|
|
|
|
|
|
|
source "drivers/hwmon/Kconfig"
|
|
|
|
@ -136,17 +142,19 @@ diff -urN linux.old/drivers/Kconfig linux.dev/drivers/Kconfig |
|
|
|
|
source "drivers/mfd/Kconfig"
|
|
|
|
|
|
|
|
|
|
source "drivers/media/Kconfig"
|
|
|
|
|
diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile
|
|
|
|
|
--- linux.old/drivers/Makefile 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/drivers/Makefile 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/drivers/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/drivers/Makefile 2007-06-10 21:32:14.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/drivers/Makefile 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -81,3 +81,4 @@
|
|
|
|
|
obj-$(CONFIG_DMA_ENGINE) += dma/
|
|
|
|
|
obj-$(CONFIG_HID) += hid/
|
|
|
|
|
obj-$(CONFIG_PPC_PS3) += ps3/
|
|
|
|
|
+obj-$(CONFIG_SSB) += ssb/
|
|
|
|
|
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
|
|
|
|
|
--- linux.old/include/asm-mips/bootinfo.h 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/include/asm-mips/bootinfo.h 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/include/asm-mips/bootinfo.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/include/asm-mips/bootinfo.h 2007-06-10 21:32:14.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/include/asm-mips/bootinfo.h 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -213,6 +213,12 @@
|
|
|
|
|
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
|
|
|
|
|
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
|
|
|
|
@ -160,9 +168,10 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti |
|
|
|
|
#define CL_SIZE COMMAND_LINE_SIZE
|
|
|
|
|
|
|
|
|
|
const char *get_system_type(void);
|
|
|
|
|
diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
|
|
|
|
--- linux.old/include/asm-mips/cpu.h 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/include/asm-mips/cpu.h 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
Index: linux-2.6.22-rc4/include/asm-mips/cpu.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/include/asm-mips/cpu.h 2007-06-10 21:32:14.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/include/asm-mips/cpu.h 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -104,6 +104,13 @@
|
|
|
|
|
#define PRID_IMP_SR71000 0x0400
|
|
|
|
|
|
|
|
|
@ -188,10 +197,11 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ISA Level encodings
|
|
|
|
|
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
|
|
|
|
|
--- linux.old/include/linux/pci_ids.h 2007-01-26 00:51:33.000000000 +0100
|
|
|
|
|
+++ linux.dev/include/linux/pci_ids.h 2007-01-25 23:34:01.000000000 +0100
|
|
|
|
|
@@ -1981,6 +1981,7 @@
|
|
|
|
|
Index: linux-2.6.22-rc4/include/linux/pci_ids.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- linux-2.6.22-rc4.orig/include/linux/pci_ids.h 2007-06-10 21:32:14.000000000 +0100
|
|
|
|
|
+++ linux-2.6.22-rc4/include/linux/pci_ids.h 2007-06-10 21:33:12.000000000 +0100
|
|
|
|
|
@@ -1991,6 +1991,7 @@
|
|
|
|
|
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
|
|
|
|
|
#define PCI_DEVICE_ID_BCM4401 0x4401
|
|
|
|
|
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
|
|
|
@ -199,4 +209,3 @@ diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h |
|
|
|
|
|
|
|
|
|
#define PCI_VENDOR_ID_TOPIC 0x151f
|
|
|
|
|
#define PCI_DEVICE_ID_TOPIC_TP560 0x0000
|
|
|
|
|
|
|
|
|
|