cleanup ifxmips and add support for both ttyS

[openwrt.git] / target / linux / ar7 / patches-2.6.24 / 100-board_support.patch

diff --git a/target/linux/ar7/patches-2.6.24/100-board_support.patch b/target/linux/ar7/patches-2.6.24/100-board_support.patch
index d23aecf..744371e 100644 (file)
--- a/target/linux/ar7/patches-2.6.24/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.24/100-board_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/Kconfig
+Index: linux-2.6.24.7/arch/mips/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/arch/mips/Kconfig    2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/Kconfig 2007-09-21 16:24:11.000000000 +0800
-@@ -15,6 +15,22 @@
+--- linux-2.6.24.7.orig/arch/mips/Kconfig
++++ linux-2.6.24.7/arch/mips/Kconfig
+@@ -16,6 +16,24 @@ choice

        prompt "System type"
        default SGI_IP22
  
        prompt "System type"
        default SGI_IP22
  


@@ -10,6 +10,8 @@ Index: linux-2.6.23-rc6/arch/mips/Kconfig
 +      bool "Texas Instruments AR7"
 +      select BOOT_ELF32
 +      select DMA_NONCOHERENT
 +      bool "Texas Instruments AR7"
 +      select BOOT_ELF32
 +      select DMA_NONCOHERENT

++      select CEVT_R4K
++      select CSRC_R4K

 +      select IRQ_CPU
 +      select NO_EXCEPT_FILL
 +      select SWAP_IO_SPACE
 +      select IRQ_CPU
 +      select NO_EXCEPT_FILL
 +      select SWAP_IO_SPACE


@@ -25,11 +27,11 @@ Index: linux-2.6.23-rc6/arch/mips/Kconfig
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  

-Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
+Index: linux-2.6.24.7/arch/mips/kernel/traps.c

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/arch/mips/kernel/traps.c     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/kernel/traps.c  2007-09-21 16:24:11.000000000 +0800
-@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *addr)
+--- linux-2.6.24.7.orig/arch/mips/kernel/traps.c
++++ linux-2.6.24.7/arch/mips/kernel/traps.c
+@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *add

  
        exception_handlers[n] = handler;
        if (n == 0 && cpu_has_divec) {
  
        exception_handlers[n] = handler;
        if (n == 0 && cpu_has_divec) {


@@ -48,18 +50,18 @@ Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
 +                      *(u32 *)(ebase + 0x20C) = 0x00000000;
 +                      flush_icache_range(ebase + 0x200, ebase + 0x210);
 +              } else {
 +                      *(u32 *)(ebase + 0x20C) = 0x00000000;
 +                      flush_icache_range(ebase + 0x200, ebase + 0x210);
 +              } else {

-+                      *(volatile u32 *)(ebase + 0x200) =
++                      *(u32 *)(ebase + 0x200) =

 +                              0x08000000 | (0x03ffffff & (handler >> 2));
 +                      flush_icache_range(ebase + 0x200, ebase + 0x204);
 +              }
        }
        return (void *)old_handler;
  }
 +                              0x08000000 | (0x03ffffff & (handler >> 2));
 +                      flush_icache_range(ebase + 0x200, ebase + 0x204);
 +              }
        }
        return (void *)old_handler;
  }

-Index: linux-2.6.23-rc6/arch/mips/Makefile
+Index: linux-2.6.24.7/arch/mips/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/arch/mips/Makefile   2007-09-21 16:24:05.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/Makefile        2007-09-21 16:24:11.000000000 +0800
-@@ -161,6 +161,13 @@
+--- linux-2.6.24.7.orig/arch/mips/Makefile
++++ linux-2.6.24.7/arch/mips/Makefile
+@@ -159,6 +159,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s

  #
  
  #
  #
  
  #


@@ -73,11 +75,11 @@ Index: linux-2.6.23-rc6/arch/mips/Makefile
  # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
  #
  core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
  # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
  #
  core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/

-Index: linux-2.6.23-rc6/include/asm-mips/page.h
+Index: linux-2.6.24.7/include/asm-mips/page.h

 ===================================================================
 ===================================================================

---- linux-2.6.23-rc6.orig/include/asm-mips/page.h      2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/include/asm-mips/page.h   2007-09-21 16:24:11.000000000 +0800
-@@ -184,8 +184,10 @@
+--- linux-2.6.24.7.orig/include/asm-mips/page.h
++++ linux-2.6.24.7/include/asm-mips/page.h
+@@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }

  #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
  
  #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)