[adm5120] use mips_machine code

[openwrt.git] / target / linux / adm5120 / patches-2.6.27 / 001-adm5120.patch

diff --git a/target/linux/adm5120/patches-2.6.27/001-adm5120.patch b/target/linux/adm5120/patches-2.6.27/001-adm5120.patch
index 5723e0a..1f09d00 100644 (file)
--- a/target/linux/adm5120/patches-2.6.27/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.27/001-adm5120.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -19,6 +19,20 @@ choice
+@@ -19,6 +19,21 @@ choice

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


@@ -17,6 +17,7 @@
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select ARCH_REQUIRE_GPIOLIB
 +      select SWAP_IO_SPACE if CPU_BIG_ENDIAN
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select ARCH_REQUIRE_GPIOLIB
 +      select SWAP_IO_SPACE if CPU_BIG_ENDIAN

++      select MIPS_MACHINE

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


@@ -53,61 +54,3 @@
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/

---- a/include/asm-mips/bootinfo.h
-+++ b/include/asm-mips/bootinfo.h
-@@ -57,6 +57,55 @@
- #define       MACH_MIKROTIK_RB532     0       /* Mikrotik RouterBoard 532     */
- #define MACH_MIKROTIK_RB532A  1       /* Mikrotik RouterBoard 532A    */
- 
-+/*
-+ * Valid machtype for group ADM5120
-+ */
-+#define MACH_ADM5120_GENERIC  0       /* Generic board */
-+#define MACH_ADM5120_WP54G_WRT        1       /* Compex WP54G-WRT */
-+#define MACH_ADM5120_WP54     2       /* Compex WP54G/WP54AG/WPP54G/WPP54AG */
-+#define MACH_ADM5120_NP28G    3       /* Compex NP28G */
-+#define MACH_ADM5120_NP28GHS  4       /* Compex NP28G HotSpot */
-+#define MACH_ADM5120_NP27G    5       /* Compex NP27G */
-+#define MACH_ADM5120_WP54Gv1C 6       /* Compex WP54G version 1C */
-+#define MACH_ADM5120_RB_11X   7       /* Mikrotik RouterBOARD 111/112 */
-+#define MACH_ADM5120_RB_133   8       /* Mikrotik RouterBOARD 133 */
-+#define MACH_ADM5120_RB_133C  9       /* Mikrotik RouterBOARD 133c */
-+#define MACH_ADM5120_RB_150   10      /* Mikrotik RouterBOARD 150 */
-+#define MACH_ADM5120_RB_153   11      /* Mikrotik RouterBOARD 153 */
-+#define MACH_ADM5120_RB_192   12      /* Mikrotik RouterBOARD 192 */
-+#define MACH_ADM5120_HS100    13      /* ZyXEL HomeSafe 100/100W */
-+#define MACH_ADM5120_P334U    14      /* ZyXEL Prestige 334U */
-+#define MACH_ADM5120_P334W    15      /* ZyXEL Prestige 334W */
-+#define MACH_ADM5120_P334WH   16      /* ZyXEL Prestige 334WH */
-+#define MACH_ADM5120_P334WHD  17      /* ZyXEL Prestige 334WHD */
-+#define MACH_ADM5120_P334WT   18      /* ZyXEL Prestige 334WT */
-+#define MACH_ADM5120_P335     19      /* ZyXEL Prestige 335/335WT */
-+#define MACH_ADM5120_P335PLUS 20      /* ZyXEL Prestige 335Plus */
-+#define MACH_ADM5120_P335U    21      /* ZyXEL Prestige 335U */
-+#define MACH_ADM5120_ES2108   22      /* ZyXEL Ethernet Switch 2108 */
-+#define MACH_ADM5120_ES2108F  23      /* ZyXEL Ethernet Switch 2108-F */
-+#define MACH_ADM5120_ES2108G  24      /* ZyXEL Ethernet Switch 2108-G */
-+#define MACH_ADM5120_ES2108LC 25      /* ZyXEL Ethernet Switch 2108-LC */
-+#define MACH_ADM5120_ES2108PWR        26      /* ZyXEL Ethernet Switch 2108-PWR */
-+#define MACH_ADM5120_ES2024A  27      /* ZyXEL Ethernet Switch 2024A */
-+#define MACH_ADM5120_ES2024PWR        28      /* ZyXEL Ethernet Switch 2024PWR */
-+#define MACH_ADM5120_CAS630   29      /* Cellvision CAS-630/630W */
-+#define MACH_ADM5120_CAS670   30      /* Cellvision CAS-670/670W */
-+#define MACH_ADM5120_CAS700   31      /* Cellvision CAS-700/700W */
-+#define MACH_ADM5120_CAS771   32      /* Cellvision CAS-771/771W */
-+#define MACH_ADM5120_CAS790   33      /* Cellvision CAS-790 */
-+#define MACH_ADM5120_CAS861   34      /* Cellvision CAS-861/861W */
-+#define MACH_ADM5120_NFS101U  35      /* Cellvision NFS-101U/101WU */
-+#define MACH_ADM5120_NFS202U  36      /* Cellvision NFS-202U/202WU */
-+#define MACH_ADM5120_EASY5120PATA 37  /* Infineon EASY 5120P-ATA */
-+#define MACH_ADM5120_EASY5120RT 38    /* Infineon EASY 5120-RT */
-+#define MACH_ADM5120_EASY5120WVOIP 39 /* Infineon EASY 5120-WVoIP */
-+#define MACH_ADM5120_EASY83000        40      /* Infineon EASY-83000 */
-+#define MACH_ADM5120_BR6104K  41      /* Edimax BR-6104K */
-+#define MACH_ADM5120_BR6104KP 42      /* Edimax BR-6104KP */
-+#define MACH_ADM5120_BR61X4WG 43      /* Edimax BR-6104Wg/BR-6114WG */
-+#define MACH_ADM5120_PMUGW    44      /* Motorola Powerline MU Gateway */
-+
- #define CL_SIZE                       COMMAND_LINE_SIZE
- 
- extern char *system_type;