[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / target / linux / amazon / patches / 100-board.patch

diff --git a/target/linux/amazon/patches/100-board.patch b/target/linux/amazon/patches/100-board.patch
index 9b29141..6c03e70 100644 (file)
--- a/target/linux/amazon/patches/100-board.patch
+++ b/target/linux/amazon/patches/100-board.patch
@@ -1,7 +1,6 @@
-diff -urN linux.old/arch/mips/Kconfig linux.dev/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
-@@ -145,6 +145,17 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -159,6 +159,17 @@ config BASLER_EXCITE_PROTOTYPE
          note that a kernel built with this option selected will not be
          able to run on normal units.
  
@@ -19,7 +18,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  config MIPS_COBALT
        bool "Cobalt Server"
        select DMA_NONCOHERENT
-@@ -766,6 +776,7 @@
+@@ -823,6 +834,7 @@ config TOSHIBA_RBTX4938
  
  endchoice
  
@@ -27,10 +26,9 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  source "arch/mips/ddb5xxx/Kconfig"
  source "arch/mips/gt64120/ev64120/Kconfig"
  source "arch/mips/jazz/Kconfig"
-diff -urN linux.old/arch/mips/Makefile linux.dev/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
-@@ -267,6 +267,13 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -267,6 +267,13 @@ libs-$(CONFIG_MIPS_XXS1500)       += arch/mips
  load-$(CONFIG_MIPS_XXS1500)   += 0xffffffff80100000
  
  #
@@ -44,15 +42,14 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  # Cobalt Server
  #
  core-$(CONFIG_MIPS_COBALT)    += arch/mips/cobalt/
-diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/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
-@@ -212,6 +212,12 @@
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h
+@@ -213,6 +213,12 @@
  #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
  
 +/*
-+ * Valid machtype for group ATHEROS
++ * Valid machtype for group Infineon
 + */
 +#define MACH_GROUP_INFINEON   27
 +#define MACH_INFINEON_AMAZON  0
@@ -60,4 +57,3 @@ 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);
-