[adm5120] sync kernel configs

[openwrt.git] / target / linux / ar71xx / patches-2.6.26 / 001-ar71xx_core.patch

diff --git a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
index 229387c..c5871c8 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile

-@@ -597,6 +597,13 @@
+@@ -597,6 +597,13 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/

  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  
  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  


@@ -16,7 +16,7 @@
  
 --- a/include/asm-mips/bootinfo.h
 +++ b/include/asm-mips/bootinfo.h
  
 --- a/include/asm-mips/bootinfo.h
 +++ b/include/asm-mips/bootinfo.h

-@@ -79,6 +79,15 @@
+@@ -79,6 +79,18 @@

  #define  MACH_LASAT_200               1       /* Masquerade PRO/SP200 */
  
  /*
  #define  MACH_LASAT_200               1       /* Masquerade PRO/SP200 */
  
  /*


@@ -24,9 +24,12 @@
 + */
 +#define MACH_AR71XX_GENERIC   0
 +#define MACH_AR71XX_WP543     1       /* Compex WP543 */
 + */
 +#define MACH_AR71XX_GENERIC   0
 +#define MACH_AR71XX_WP543     1       /* Compex WP543 */

-+#define MACH_AR71XX_RB_411    2       /* MikroTik RouterBOARD 411 */
++#define MACH_AR71XX_RB_411    2       /* MikroTik RouterBOARD 411/411A/411AH */

 +#define MACH_AR71XX_RB_433    3       /* MikroTik RouterBOARD 433/433AH */
 +#define MACH_AR71XX_RB_450    4       /* MikroTik RouterBOARD 450 */
 +#define MACH_AR71XX_RB_433    3       /* MikroTik RouterBOARD 433/433AH */
 +#define MACH_AR71XX_RB_450    4       /* MikroTik RouterBOARD 450 */

++#define MACH_AR71XX_RB_493    5       /* Mikrotik RouterBOARD 493/493AH */
++#define MACH_AR71XX_AW_NR580  6       /* AzureWave AW-NR580 */
++#define MACH_AR71XX_AP83      7       /* Atheros AP83 */

 +
 +/*
   * Valid machtype for group NEC EMMA2RH
 +
 +/*
   * Valid machtype for group NEC EMMA2RH


@@ -34,7 +37,7 @@
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -21,6 +21,24 @@
+@@ -21,6 +21,24 @@ choice

  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  


@@ -59,3 +62,11 @@
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K

+@@ -687,6 +705,7 @@ config WR_PPMC
+ 
+ endchoice
+ 
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"