diff options
Diffstat (limited to 'target/lemote/patches')
| -rw-r--r-- | target/lemote/patches/yeelong.patch | 2033 |
1 files changed, 1006 insertions, 1027 deletions
diff --git a/target/lemote/patches/yeelong.patch b/target/lemote/patches/yeelong.patch index 66aa62573..7a88585b9 100644 --- a/target/lemote/patches/yeelong.patch +++ b/target/lemote/patches/yeelong.patch @@ -1,223 +1,6 @@ -diff -Nur linux-2.6.30/.gitignore rt4ls/.gitignore ---- linux-2.6.30/.gitignore 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/.gitignore 2009-06-12 16:27:01.954006636 +0200 -@@ -32,6 +32,7 @@ - tags - TAGS - vmlinux -+vmlinux.32 - System.map - Module.markers - Module.symvers -diff -Nur linux-2.6.30/Documentation/kernel-parameters.txt rt4ls/Documentation/kernel-parameters.txt ---- linux-2.6.30/Documentation/kernel-parameters.txt 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/Documentation/kernel-parameters.txt 2009-06-12 16:27:02.534042890 +0200 -@@ -1220,6 +1220,10 @@ - (machvec) in a generic kernel. - Example: machvec=hpzx1_swiotlb - -+ machtype= [Loongson] Share the same kernel image file between different -+ yeeloong laptop. -+ Example: machtype=lemote-yeeloong-2f-7inch -+ - max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater - than or equal to this physical address is ignored. - -diff -Nur linux-2.6.30/arch/mips/Kconfig rt4ls/arch/mips/Kconfig ---- linux-2.6.30/arch/mips/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/Kconfig 2009-06-12 16:27:08.186400556 +0200 -@@ -6,7 +6,7 @@ - select HAVE_ARCH_KGDB - # Horrible source of confusion. Die, die, die ... - select EMBEDDED -- select RTC_LIB -+ select RTC_LIB if !MACH_LOONGSON - - mainmenu "Linux/MIPS Kernel Configuration" - -@@ -154,30 +154,15 @@ - select SYS_SUPPORTS_64BIT_KERNEL if BROKEN - select SYS_SUPPORTS_LITTLE_ENDIAN - --config LEMOTE_FULONG -- bool "Lemote Fulong mini-PC" -- select ARCH_SPARSEMEM_ENABLE -- select CEVT_R4K -- select CSRC_R4K -- select SYS_HAS_CPU_LOONGSON2 -- select DMA_NONCOHERENT -- select BOOT_ELF32 -- select BOARD_SCACHE -- select HAVE_STD_PC_SERIAL_PORT -- select HW_HAS_PCI -- select I8259 -- select ISA -- select IRQ_CPU -- select SYS_SUPPORTS_32BIT_KERNEL -- select SYS_SUPPORTS_64BIT_KERNEL -- select SYS_SUPPORTS_LITTLE_ENDIAN -- select SYS_SUPPORTS_HIGHMEM -- select SYS_HAS_EARLY_PRINTK -- select GENERIC_ISA_DMA_SUPPORT_BROKEN -- select CPU_HAS_WB -+config MACH_LOONGSON -+ bool "Loongson family of machines" - help -- Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and -- an FPGA northbridge -+ This enables the support of Loongson family of machines. -+ -+ Loongson is a family of general-purpose MIPS-compatible CPUs. -+ developed at Institute of Computing Technology (ICT), -+ Chinese Academy of Sciences (CAS) in the People's Republic -+ of China. The chief architect is Professor Weiwu Hu. - - config MIPS_MALTA - bool "MIPS Malta board" -@@ -643,6 +628,7 @@ - source "arch/mips/txx9/Kconfig" - source "arch/mips/vr41xx/Kconfig" - source "arch/mips/cavium-octeon/Kconfig" -+source "arch/mips/loongson/Kconfig" - - endmenu - -@@ -1005,16 +991,29 @@ - prompt "CPU type" - default CPU_R4X00 - --config CPU_LOONGSON2 -- bool "Loongson 2" -- depends on SYS_HAS_CPU_LOONGSON2 -- select CPU_SUPPORTS_32BIT_KERNEL -- select CPU_SUPPORTS_64BIT_KERNEL -- select CPU_SUPPORTS_HIGHMEM -+config CPU_LOONGSON2E -+ bool "Loongson 2E" -+ depends on SYS_HAS_CPU_LOONGSON2E -+ select CPU_LOONGSON2 - help - The Loongson 2E processor implements the MIPS III instruction set - with many extensions. - -+ It has an internal FPGA northbridge, which is compatiable to -+ bonito64. -+ -+config CPU_LOONGSON2F -+ bool "Loongson 2F" -+ depends on SYS_HAS_CPU_LOONGSON2F -+ select CPU_LOONGSON2 -+ help -+ The Loongson 2F processor implements the MIPS III instruction set -+ with many extensions. -+ -+ Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller -+ have a similar programming interface with FPGA northbridge used in -+ Loongson2E. -+ - config CPU_MIPS32_R1 - bool "MIPS32 Release 1" - depends on SYS_HAS_CPU_MIPS32_R1 -@@ -1253,7 +1252,16 @@ - - endchoice - --config SYS_HAS_CPU_LOONGSON2 -+config CPU_LOONGSON2 -+ bool -+ select CPU_SUPPORTS_32BIT_KERNEL -+ select CPU_SUPPORTS_64BIT_KERNEL -+ select CPU_SUPPORTS_HIGHMEM -+ -+config SYS_HAS_CPU_LOONGSON2E -+ bool -+ -+config SYS_HAS_CPU_LOONGSON2F - bool - - config SYS_HAS_CPU_MIPS32_R1 -@@ -2121,6 +2129,9 @@ - - menu "Power management options" - -+config ARCH_HIBERNATION_POSSIBLE -+ def_bool y -+ - config ARCH_SUSPEND_POSSIBLE - def_bool y - depends on !SMP -@@ -2129,6 +2140,23 @@ - - endmenu - -+menu "CPU Frequency scaling" -+ -+source "drivers/cpufreq/Kconfig" -+ -+config LOONGSON2F_CPU_FREQ -+ bool "Loongson-2F CPU Frequency driver" -+ depends on CPU_LOONGSON2F && CPU_FREQ && (CS5536_MFGPT || I8253) -+ select CPU_FREQ_TABLE -+ help -+ This adds the cpufreq driver for Loongson-2F. -+ -+ For details, take a look at <file:Documentation/cpu-freq>. -+ -+ If unsure, say N. -+ -+endmenu -+ - source "net/Kconfig" - - source "drivers/Kconfig" -diff -Nur linux-2.6.30/arch/mips/Makefile rt4ls/arch/mips/Makefile ---- linux-2.6.30/arch/mips/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/Makefile 2009-06-12 16:27:08.186400556 +0200 -@@ -120,7 +120,14 @@ - cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap - cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap - cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap --cflags-$(CONFIG_CPU_LOONGSON2) += -march=r4600 -Wa,--trap -+ -+# only gcc >= 4.4 have the loongson-specific support -+cflags-$(CONFIG_CPU_LOONGSON2) += -Wa,--trap -+cflags-$(CONFIG_CPU_LOONGSON2E) += \ -+ $(call cc-option,-march=loongson2e,-march=r4600) $(call cc-option,-mtune=loongson2e) -+cflags-$(CONFIG_CPU_LOONGSON2F) += \ -+ $(call cc-option,-march=loongson2f,-march=r4600) $(call cc-optoin,-mtune=loongson2f) -+ - cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32 -Wa,--trap - cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ -@@ -307,9 +314,12 @@ - # - # lemote fulong mini-PC board - # --core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/ --load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000 --cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote -+core-$(CONFIG_MACH_LOONGSON) +=arch/mips/loongson/ -+cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson \ -+ -mno-branch-likely -+load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000 -+load-$(CONFIG_LEMOTE_FULOONG2F) +=0xffffffff80200000 -+load-$(CONFIG_LEMOTE_YEELOONG2F) +=0xffffffff80200000 - - # - # MIPS Malta board -@@ -675,6 +685,9 @@ - - drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ - -+# suspend and hibernation support -+drivers-$(CONFIG_PM) += arch/mips/power/ -+ - ifdef CONFIG_LASAT - rom.bin rom.sw: vmlinux - $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@ -diff -Nur linux-2.6.30/arch/mips/configs/fulong_defconfig rt4ls/arch/mips/configs/fulong_defconfig ---- linux-2.6.30/arch/mips/configs/fulong_defconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/configs/fulong_defconfig 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fulong_defconfig linux-2.6.30/arch/mips/configs/fulong_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fulong_defconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/configs/fulong_defconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,1912 +0,0 @@ -# -# Automatically generated make config: don't edit @@ -2131,9 +1914,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fulong_defconfig rt4ls/arch/mips/config -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -diff -Nur linux-2.6.30/arch/mips/configs/fuloong2e_defconfig rt4ls/arch/mips/configs/fuloong2e_defconfig ---- linux-2.6.30/arch/mips/configs/fuloong2e_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/fuloong2e_defconfig 2009-06-12 16:27:08.246405134 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fuloong2e_defconfig linux-2.6.30/arch/mips/configs/fuloong2e_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fuloong2e_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/fuloong2e_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2018 @@ +# +# Automatically generated make config: don't edit @@ -4153,9 +3936,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fuloong2e_defconfig rt4ls/arch/mips/con +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/configs/fuloong2f_defconfig rt4ls/arch/mips/configs/fuloong2f_defconfig ---- linux-2.6.30/arch/mips/configs/fuloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/fuloong2f_defconfig 2009-06-12 16:27:08.246405134 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fuloong2f_defconfig linux-2.6.30/arch/mips/configs/fuloong2f_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fuloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/fuloong2f_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2637 @@ +# +# Automatically generated make config: don't edit @@ -6794,9 +6577,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fuloong2f_defconfig rt4ls/arch/mips/con +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig rt4ls/arch/mips/configs/yeeloong2f_defconfig ---- linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/yeeloong2f_defconfig 2009-06-12 16:27:08.290407950 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/yeeloong2f_defconfig linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig +--- linux-2.6.30.orig/arch/mips/configs/yeeloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2711 @@ +# +# Automatically generated make config: don't edit @@ -9509,9 +9292,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig rt4ls/arch/mips/co +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/include/asm/bootinfo.h rt4ls/arch/mips/include/asm/bootinfo.h ---- linux-2.6.30/arch/mips/include/asm/bootinfo.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/bootinfo.h 2009-06-12 16:27:08.306407755 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/bootinfo.h linux-2.6.30/arch/mips/include/asm/bootinfo.h +--- linux-2.6.30.orig/arch/mips/include/asm/bootinfo.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/bootinfo.h 2009-06-14 20:25:19.000000000 +0200 @@ -7,6 +7,7 @@ * Copyright (C) 1995, 1996 Andreas Busse * Copyright (C) 1995, 1996 Stoned Elipot @@ -9537,9 +9320,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/bootinfo.h rt4ls/arch/mips/include/ #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h rt4ls/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9600,9 +9383,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h -#define cpu_icache_snoops_remote_store 1 - -#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h rt4ls/arch/mips/include/asm/mach-lemote/dma-coherence.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/dma-coherence.h linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/dma-coherence.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9670,9 +9453,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h rt4ls/a -} - -#endif /* __ASM_MACH_LEMOTE_DMA_COHERENCE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h rt4ls/arch/mips/include/asm/mach-lemote/mc146818rtc.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/mc146818rtc.h linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/mc146818rtc.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9710,9 +9493,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h rt4ls/arc -#endif - -#endif /* __ASM_MACH_LEMOTE_MC146818RTC_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h rt4ls/arch/mips/include/asm/mach-lemote/pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/pci.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/pci.h linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/pci.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2008 Zhang Le <r0bertz@gentoo.org> @@ -9744,9 +9527,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h rt4ls/arch/mips/i -#define LOONGSON2E_IO_PORT_BASE 0x1fd00000UL - -#endif /* !_LEMOTE_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h rt4ls/arch/mips/include/asm/mach-lemote/war.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/war.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/war.h linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/war.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9773,9 +9556,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h rt4ls/arch/mips/i -#define MIPS34K_MISSED_ITLB_WAR 0 - -#endif /* __ASM_MIPS_MACH_LEMOTE_WAR_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h rt4ls/arch/mips/include/asm/mach-loongson/clock.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/clock.h 2009-06-12 16:27:08.506427365 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/clock.h linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,64 @@ +#ifndef __ASM_MIPS_CLOCK_H +#define __ASM_MIPS_CLOCK_H @@ -9841,9 +9624,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h rt4ls/arch/mi +int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id); + +#endif /* __ASM_MIPS_CLOCK_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h rt4ls/arch/mips/include/asm/mach-loongson/cmdline.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cmdline.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cmdline.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cmdline.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,9 @@ +/* machine-specific command line initialization */ +#ifdef CONFIG_SYS_HAS_MACH_PROM_INIT_CMDLINE @@ -9854,9 +9637,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h rt4ls/arch/ +} +#endif + -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h rt4ls/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -9917,9 +9700,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides +#define cpu_icache_snoops_remote_store 1 + +#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,382 @@ +/* + * The header file of cs5536 sourth bridge. @@ -10303,9 +10086,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h rt4ls +#define GPIOL_OUT_EN 0x04 + +#endif /* _CS5536_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,26 @@ +/* + * cs5536 mfgpt header file @@ -10333,9 +10116,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h +#define MFGPT0_SETUP (MFGPT_BASE + 6) + +#endif /*!_CS5536_MFGPT_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,174 @@ +/* + * the definition file of cs5536 Virtual Support Module(VSM). @@ -10511,9 +10294,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h r +#define PCI_EHCI_FLADJ_REG 0x60 + +#endif /* _CS5536_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * the Virtual Support Module(VSM) read/write interfaces @@ -10574,9 +10357,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h r + DEFINE_CS5536_MODULE(udc) +#endif +#endif /* _CS5536_VSM_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h rt4ls/arch/mips/include/asm/mach-loongson/dma-coherence.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/dma-coherence.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/dma-coherence.h linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,70 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -10648,9 +10431,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h rt4ls +} + +#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h rt4ls/arch/mips/include/asm/mach-loongson/loongson.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/loongson.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/loongson.h linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/loongson.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,319 @@ +/* + * Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca> @@ -10971,9 +10754,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h rt4ls/arch + +#endif /* __LOONGSON_H */ + -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h rt4ls/arch/mips/include/asm/mach-loongson/machine.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/machine.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/machine.h linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/machine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * board-specific header file @@ -11051,9 +10834,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h rt4ls/arch/ +#endif + +#endif /* ! __MACHINE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h rt4ls/arch/mips/include/asm/mach-loongson/mc146818rtc.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/mc146818rtc.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mc146818rtc.h linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -11091,9 +10874,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h rt4ls/a +#endif + +#endif /* __ASM_MACH_LOONGSON_MC146818RTC_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h rt4ls/arch/mips/include/asm/mach-loongson/mem.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/mem.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mem.h linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,31 @@ +#ifndef __MEM_H +#define __MEM_H @@ -11126,9 +10909,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h rt4ls/arch/mips +#endif + +#endif /* !__MEM_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h rt4ls/arch/mips/include/asm/mach-loongson/pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/pci.h 2009-06-12 16:27:08.514429781 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/pci.h linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2008 Zhang Le <r0bertz@gentoo.org> @@ -11189,9 +10972,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h rt4ls/arch/mips + + +#endif /* !_LOONGSON_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h rt4ls/arch/mips/include/asm/mach-loongson/war.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/war.h 2009-06-12 16:27:08.514429781 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/war.h linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/war.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -11218,9 +11001,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h rt4ls/arch/mips +#define MIPS34K_MISSED_ITLB_WAR 0 + +#endif /* __ASM_MIPS_MACH_LOONGSON_WAR_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h rt4ls/arch/mips/include/asm/mips-boards/bonito64.h ---- linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-12 16:27:08.574431556 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mips-boards/bonito64.h linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h +--- linux-2.6.30.orig/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-14 20:25:19.000000000 +0200 @@ -26,11 +26,6 @@ /* offsets from base register */ #define BONITO(x) (x) @@ -11233,9 +11016,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h rt4ls/arch/m #else /* -diff -Nur linux-2.6.30/arch/mips/include/asm/page.h rt4ls/arch/mips/include/asm/page.h ---- linux-2.6.30/arch/mips/include/asm/page.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/page.h 2009-06-12 16:27:08.602426182 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/page.h linux-2.6.30/arch/mips/include/asm/page.h +--- linux-2.6.30.orig/arch/mips/include/asm/page.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/page.h 2009-06-14 20:25:19.000000000 +0200 @@ -179,8 +179,9 @@ #endif @@ -11248,9 +11031,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/page.h rt4ls/arch/mips/include/asm/ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -Nur linux-2.6.30/arch/mips/include/asm/pci.h rt4ls/arch/mips/include/asm/pci.h ---- linux-2.6.30/arch/mips/include/asm/pci.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/pci.h 2009-06-12 16:27:08.606433396 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/pci.h linux-2.6.30/arch/mips/include/asm/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/pci.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -56,7 +56,7 @@ /* * board supplied pci irq fixup routine @@ -11260,9 +11043,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/pci.h rt4ls/arch/mips/include/asm/p /* Can be used to override the logic in pci_scan_bus for skipping -diff -Nur linux-2.6.30/arch/mips/include/asm/pgtable.h rt4ls/arch/mips/include/asm/pgtable.h ---- linux-2.6.30/arch/mips/include/asm/pgtable.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/pgtable.h 2009-06-12 16:27:08.610435582 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/pgtable.h linux-2.6.30/arch/mips/include/asm/pgtable.h +--- linux-2.6.30.orig/arch/mips/include/asm/pgtable.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/pgtable.h 2009-06-14 20:25:19.000000000 +0200 @@ -370,6 +370,19 @@ #include <asm-generic/pgtable.h> @@ -11283,9 +11066,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/pgtable.h rt4ls/arch/mips/include/a * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture. */ -diff -Nur linux-2.6.30/arch/mips/include/asm/stackframe.h rt4ls/arch/mips/include/asm/stackframe.h ---- linux-2.6.30/arch/mips/include/asm/stackframe.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/stackframe.h 2009-06-12 16:27:08.674441225 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/stackframe.h linux-2.6.30/arch/mips/include/asm/stackframe.h +--- linux-2.6.30.orig/arch/mips/include/asm/stackframe.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/stackframe.h 2009-06-14 20:25:19.000000000 +0200 @@ -117,6 +117,20 @@ .endm #else @@ -11307,9 +11090,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/stackframe.h rt4ls/arch/mips/includ #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) lui k1, %hi(kernelsp) #else -diff -Nur linux-2.6.30/arch/mips/include/asm/suspend.h rt4ls/arch/mips/include/asm/suspend.h ---- linux-2.6.30/arch/mips/include/asm/suspend.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/suspend.h 2009-06-12 16:27:08.678439779 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/suspend.h linux-2.6.30/arch/mips/include/asm/suspend.h +--- linux-2.6.30.orig/arch/mips/include/asm/suspend.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/suspend.h 2009-06-14 20:25:19.000000000 +0200 @@ -1,6 +1,9 @@ #ifndef __ASM_SUSPEND_H #define __ASM_SUSPEND_H @@ -11321,9 +11104,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/suspend.h rt4ls/arch/mips/include/a +extern const void __nosave_begin, __nosave_end; #endif /* __ASM_SUSPEND_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/generic.h rt4ls/arch/mips/include/asm/txx9/generic.h ---- linux-2.6.30/arch/mips/include/asm/txx9/generic.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/generic.h 2009-06-12 16:27:08.686439682 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/generic.h linux-2.6.30/arch/mips/include/asm/txx9/generic.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/generic.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/generic.h 2009-06-14 20:25:19.000000000 +0200 @@ -37,7 +37,7 @@ void (*arch_init)(void); void (*device_init)(void); @@ -11333,9 +11116,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/generic.h rt4ls/arch/mips/incl #endif }; extern struct txx9_board_vec *txx9_board_vec; -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h rt4ls/arch/mips/include/asm/txx9/jmr3927.h ---- linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/jmr3927.h 2009-06-12 16:27:08.686439682 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/jmr3927.h linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/jmr3927.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h 2009-06-14 20:25:19.000000000 +0200 @@ -175,6 +175,6 @@ void jmr3927_prom_init(void); void jmr3927_irq_setup(void); @@ -11344,9 +11127,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h rt4ls/arch/mips/incl +int jmr3927_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_JMR3927_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h rt4ls/arch/mips/include/asm/txx9/rbtx4927.h ---- linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4927.h linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-14 20:25:19.000000000 +0200 @@ -87,6 +87,6 @@ void rbtx4927_prom_init(void); void rbtx4927_irq_setup(void); @@ -11355,9 +11138,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h rt4ls/arch/mips/inc +int rbtx4927_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_RBTX4927_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h rt4ls/arch/mips/include/asm/txx9/rbtx4938.h ---- linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4938.h linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-14 20:25:19.000000000 +0200 @@ -140,6 +140,6 @@ void rbtx4938_prom_init(void); void rbtx4938_irq_setup(void); @@ -11366,9 +11149,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h rt4ls/arch/mips/inc +int rbtx4938_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_RBTX4938_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h rt4ls/arch/mips/include/asm/txx9/tx4938.h ---- linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/tx4938.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4938.h linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4938.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h 2009-06-14 20:25:19.000000000 +0200 @@ -287,7 +287,7 @@ void tx4938_report_pci1clk(void); int tx4938_pciclk66_setup(void); @@ -11378,9 +11161,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h rt4ls/arch/mips/inclu void tx4938_setup_pcierr_irq(void); void tx4938_irq_init(void); void tx4938_mtd_init(int ch); -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h rt4ls/arch/mips/include/asm/txx9/tx4939.h ---- linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/tx4939.h 2009-06-12 16:27:08.694430645 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4939.h linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4939.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h 2009-06-14 20:25:19.000000000 +0200 @@ -534,8 +534,8 @@ int tx4939_report_pciclk(void); void tx4939_report_pci1clk(void); @@ -11392,20 +11175,156 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h rt4ls/arch/mips/inclu void tx4939_setup_pcierr_irq(void); void tx4939_irq_init(void); int tx4939_irq(void); -diff -Nur linux-2.6.30/arch/mips/kernel/Makefile rt4ls/arch/mips/kernel/Makefile ---- linux-2.6.30/arch/mips/kernel/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/Makefile 2009-06-12 16:27:08.710440787 +0200 -@@ -73,6 +73,7 @@ - obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o - obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o - obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o -+obj-$(CONFIG_LOONGSON2F_CPU_FREQ) += loongson2f_freq.o +diff -Nur linux-2.6.30.orig/arch/mips/Kconfig linux-2.6.30/arch/mips/Kconfig +--- linux-2.6.30.orig/arch/mips/Kconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/Kconfig 2009-06-14 20:25:19.000000000 +0200 +@@ -6,7 +6,7 @@ + select HAVE_ARCH_KGDB + # Horrible source of confusion. Die, die, die ... + select EMBEDDED +- select RTC_LIB ++ select RTC_LIB if !MACH_LOONGSON - obj-$(CONFIG_KGDB) += kgdb.o - obj-$(CONFIG_PROC_FS) += proc.o -diff -Nur linux-2.6.30/arch/mips/kernel/asm-offsets.c rt4ls/arch/mips/kernel/asm-offsets.c ---- linux-2.6.30/arch/mips/kernel/asm-offsets.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/asm-offsets.c 2009-06-12 16:27:08.710440787 +0200 + mainmenu "Linux/MIPS Kernel Configuration" + +@@ -154,30 +154,15 @@ + select SYS_SUPPORTS_64BIT_KERNEL if BROKEN + select SYS_SUPPORTS_LITTLE_ENDIAN + +-config LEMOTE_FULONG +- bool "Lemote Fulong mini-PC" +- select ARCH_SPARSEMEM_ENABLE +- select CEVT_R4K +- select CSRC_R4K +- select SYS_HAS_CPU_LOONGSON2 +- select DMA_NONCOHERENT +- select BOOT_ELF32 +- select BOARD_SCACHE +- select HAVE_STD_PC_SERIAL_PORT +- select HW_HAS_PCI +- select I8259 +- select ISA +- select IRQ_CPU +- select SYS_SUPPORTS_32BIT_KERNEL +- select SYS_SUPPORTS_64BIT_KERNEL +- select SYS_SUPPORTS_LITTLE_ENDIAN +- select SYS_SUPPORTS_HIGHMEM +- select SYS_HAS_EARLY_PRINTK +- select GENERIC_ISA_DMA_SUPPORT_BROKEN +- select CPU_HAS_WB ++config MACH_LOONGSON ++ bool "Loongson family of machines" + help +- Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and +- an FPGA northbridge ++ This enables the support of Loongson family of machines. ++ ++ Loongson is a family of general-purpose MIPS-compatible CPUs. ++ developed at Institute of Computing Technology (ICT), ++ Chinese Academy of Sciences (CAS) in the People's Republic ++ of China. The chief architect is Professor Weiwu Hu. + + config MIPS_MALTA + bool "MIPS Malta board" +@@ -643,6 +628,7 @@ + source "arch/mips/txx9/Kconfig" + source "arch/mips/vr41xx/Kconfig" + source "arch/mips/cavium-octeon/Kconfig" ++source "arch/mips/loongson/Kconfig" + + endmenu + +@@ -1005,16 +991,29 @@ + prompt "CPU type" + default CPU_R4X00 + +-config CPU_LOONGSON2 +- bool "Loongson 2" +- depends on SYS_HAS_CPU_LOONGSON2 +- select CPU_SUPPORTS_32BIT_KERNEL +- select CPU_SUPPORTS_64BIT_KERNEL +- select CPU_SUPPORTS_HIGHMEM ++config CPU_LOONGSON2E ++ bool "Loongson 2E" ++ depends on SYS_HAS_CPU_LOONGSON2E ++ select CPU_LOONGSON2 + help + The Loongson 2E processor implements the MIPS III instruction set + with many extensions. + ++ It has an internal FPGA northbridge, which is compatiable to ++ bonito64. ++ ++config CPU_LOONGSON2F ++ bool "Loongson 2F" ++ depends on SYS_HAS_CPU_LOONGSON2F ++ select CPU_LOONGSON2 ++ help ++ The Loongson 2F processor implements the MIPS III instruction set ++ with many extensions. ++ ++ Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller ++ have a similar programming interface with FPGA northbridge used in ++ Loongson2E. ++ + config CPU_MIPS32_R1 + bool "MIPS32 Release 1" + depends on SYS_HAS_CPU_MIPS32_R1 +@@ -1253,7 +1252,16 @@ |