[MIPS] remove unused mips_machtype

Removed unused mips_machtype.  These are only set but not used.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 43298fd9459ca20da50124cb9e0920e8132b0818..e822c123eab82e8e41a0b94a60496f77a1ae9b08 100644 (file)
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -57,17 +57,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       /* Set the platform # */
-#if    defined(CONFIG_MIPS_DB1550)
-       mips_machtype = MACH_DB1550;
-#elif  defined(CONFIG_MIPS_DB1500)
-       mips_machtype = MACH_DB1500;
-#elif  defined(CONFIG_MIPS_DB1100)
-       mips_machtype = MACH_DB1100;
-#else
-       mips_machtype = MACH_DB1000;
-#endif
-
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");

diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index cdeae3212a2d5e48dabfc7f17d7dfe3a1f26a84c..e700fd312a24f0f853f2aa9564c512135622c2ff 100644 (file)
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -54,8 +54,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_MTX1;      /* set the platform # */
-
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");

diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index ddccaf6997d0924a8ef0b2098c3af621b70c8c97..2515b9fb24af68b0d703b978d70d994d24db4207 100644 (file)
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -52,8 +52,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_PB1000;
-
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
        if (!memsize_str) {

diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index c93fd39b4abae21e44cbf5e3835e622dbea99d6a..490c3801c275813ace198893e4b2d3b3f38f051e 100644 (file)
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -53,8 +53,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg3;
 
-       mips_machtype = MACH_PB1100;
-
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");

diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index c251570749ee3cf668ff27123c3f172147087bc3..069ed45f04f2e504e7f9522d0cc9c07aff0e6008 100644 (file)
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -53,8 +53,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_PB1200;
-
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
        if (!memsize_str) {

diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 507d4b20416175cccf728c38d8af225be162a27b..db558c967048e766379e7fca31122dfe16ebb59e 100644 (file)
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -53,8 +53,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_PB1500;
-
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
        if (!memsize_str) {

diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index b03eee601e360525b9afd65096d4d1228025bb62..b716363ea56443a4d3ce1ddf74bb88b7db05310b 100644 (file)
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -53,8 +53,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_PB1550;
-
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
        if (!memsize_str) {

diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index 6532939f377aac0ac0a096a6352b5ddf59938d31..7e6878c1b0a58aa0b1fcb9031ecfa585b7dc0f20 100644 (file)
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -52,8 +52,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machtype = MACH_XXS1500;   /* set the platform # */
-
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");

diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c
index 2d752c2f6e5902de96faef7915b4eb5a51d9d72b..68d8bc597e347a83ce17a356ccaf32864c05f68d 100644 (file)
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -135,8 +135,6 @@ void __init prom_init(void)
 #ifdef CONFIG_64BIT
 #      error 64 bit support not implemented
 #endif /* CONFIG_64BIT */
-
-       mips_machtype = MACH_TITAN_EXCITE;
 }
 
 /* This is called from free_initmem(), so we need to provide it */

diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index 51f6b7862460eca4f9d523eb038fab740733e73d..728ef6a80edd0f613b4754f5f211b01dcef83797 100644 (file)
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -121,8 +121,6 @@ const char *get_system_type(void)
  */
 void __init prom_init(void)
 {
-       mips_machtype = MACH_WRPPMC;
-
        add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM);
        add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA);
 

diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c
index b643f75ec9a54fc3ed89bed96ba4dfcd30e1524b..700b9cf8eb9d7dee8b4c25a479d1ebf388dea97c 100644 (file)
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/jmr3927/rbhma3100/init.c
@@ -52,10 +52,6 @@ void __init prom_init(void)
                puts("Warning: TX3927 TLB off\n");
 #endif
 
-#ifdef CONFIG_TOSHIBA_JMR3927
-       mips_machtype = MACH_TOSHIBA_JMR3927;
-#endif
-
        prom_init_cmdline();
        add_memory_region(0, JMR3927_SDRAM_SIZE, BOOT_MEM_RAM);
 }

diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
index 82433681219862fba6e227c645a1af06e092d531..7edc15dfed6cf44f94b180165cb51bc25ac01e7d 100644 (file)
--- a/arch/mips/lemote/lm2e/prom.c
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -57,8 +57,6 @@ void __init prom_init(void)
        arg = (int *)fw_arg1;
        env = (int *)fw_arg2;
 
-       mips_machtype = MACH_LEMOTE_FULONG;
-
        prom_init_cmdline();
 
        if ((strstr(arcs_cmdline, "console=")) == NULL)

diff --git a/arch/mips/philips/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c
index cfd90fa3d799cef4b535d614a4cf2bf10c9ebfd3..90b4d35f3eceb2b4cde916d43f6a03e04f7b143c 100644 (file)
--- a/arch/mips/philips/pnx8550/jbs/init.c
+++ b/arch/mips/philips/pnx8550/jbs/init.c
@@ -45,11 +45,8 @@ const char *get_system_type(void)
 
 void __init prom_init(void)
 {
-
        unsigned long memsize;
 
-       mips_machtype = MACH_PHILIPS_JBS;
-
        //memsize = 0x02800000; /* Trimedia uses memory above */
        memsize = 0x08000000; /* Trimedia uses memory above */
        add_memory_region(0, memsize, BOOT_MEM_RAM);

diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c
index fdb33ed089b9606656ae4f9c9c34611abac8692b..832dd60b0a7a80113a5cd824b3db8954b52ee0d8 100644 (file)
--- a/arch/mips/philips/pnx8550/stb810/prom_init.c
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -41,8 +41,6 @@ void __init prom_init(void)
 
        prom_init_cmdline();
 
-       mips_machtype = MACH_PHILIPS_STB810;
-
        memsize = 0x08000000; /* Trimedia uses memory above */
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }

diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 9b9936de65894a7dff5c65a14614d775205a673e..96d3ff051d3da86902ecb3a554b564d9f4be7830 100644 (file)
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -126,8 +126,6 @@ void __init prom_init(void)
                env++;
        }
 
-       mips_machtype = MACH_TITAN_YOSEMITE;
-
        prom_grab_secondary();
 }
 

diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
index 69f21c1b7942ee5161cdbc0b694164b3d0182e75..1644bffa501aae4d940c14026a162bf2ee009ef2 100644 (file)
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
@@ -47,7 +47,6 @@ void __init prom_init(void)
 #ifndef CONFIG_TX4938_NAND_BOOT
        prom_init_cmdline();
 #endif
-       mips_machtype = MACH_TOSHIBA_RBTX4938;
 
        msize = tx4938_get_mem_size();
        add_memory_region(0, msize << 20, BOOT_MEM_RAM);

diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index f14bea8daf908e42c41578fa78e8e922f73a9986..7723d2011b08d904f27954a1e1f8b0fd9583be7a 100644 (file)
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,8 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
 #endif
        set_io_port_base(KSEG1ADDR(0x16000000));
 
-       mips_machtype = MACH_NEC_CMBVR4133;
-
 #ifdef CONFIG_PCI
 #ifdef CONFIG_ROCKHOPPER
        ali_m5229_preinit();

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index b2dd9b33de8fd3c50685fa59b24bb2b3b4c0a0e3..8e9bb16f0aa2b99a7e5451b0bf693dbe24e17921 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -47,22 +47,11 @@
 #define  MACH_DS5800           9       /* DECsystem 5800               */
 #define  MACH_DS5900           10      /* DECsystem 5900               */
 
-/*
- * Valid machtype for group ARC
- */
-#define MACH_DESKSTATION_RPC44  0      /* Deskstation rPC44 */
-#define MACH_DESKSTATION_TYNE  1       /* Deskstation Tyne */
-
 /*
  * Valid machtype for group SNI_RM
  */
 #define  MACH_SNI_RM200_PCI    0       /* RM200/RM300/RM400 PCI series */
 
-/*
- * Valid machtype for group ACN
- */
-#define  MACH_ACN_MIPS_BOARD   0       /* ACN MIPS single board        */
-
 /*
  * Valid machtype for group SGI
  */
@@ -72,44 +61,6 @@
 #define  MACH_SGI_IP32         3       /* O2                           */
 #define  MACH_SGI_IP30         4       /* Octane, Octane2              */
 
-/*
- * Valid machtype for group COBALT
- */
-#define  MACH_COBALT_27                0       /* Proto "27" hardware          */
-
-/*
- * Valid machtype for group BAGET
- */
-#define  MACH_BAGET201         0       /* BT23-201 */
-#define  MACH_BAGET202         1       /* BT23-202 */
-
-/*
- * Cosine boards.
- */
-#define  MACH_COSINE_ORION     0
-
-/*
- * Valid machtype for group MOMENCO
- */
-#define  MACH_MOMENCO_OCELOT   0
-#define  MACH_MOMENCO_OCELOT_G 1       /* no more supported (may 2007) */
-#define  MACH_MOMENCO_OCELOT_C 2       /* no more supported (jun 2007) */
-#define  MACH_MOMENCO_JAGUAR_ATX 3     /* no more supported (may 2007) */
-#define  MACH_MOMENCO_OCELOT_3 4
-
-/*
- * Valid machtype for group PHILIPS
- */
-#define  MACH_PHILIPS_NINO     0       /* Nino */
-#define  MACH_PHILIPS_VELO     1       /* Velo */
-#define  MACH_PHILIPS_JBS      2       /* JBS */
-#define  MACH_PHILIPS_STB810   3       /* STB810 */
-
-/*
- * Valid machtype for group SIBYTE
- */
-#define  MACH_SWARM              0
-
 /*
  * Valid machtypes for group Toshiba
  */
@@ -121,64 +72,17 @@
 #define  MACH_TOSHIBA_RBTX4937 5
 #define  MACH_TOSHIBA_RBTX4938 6
 
-/*
- * Valid machtype for group Alchemy
- */
-#define  MACH_PB1000           0       /* Au1000-based eval board */
-#define  MACH_PB1100           1       /* Au1100-based eval board */
-#define  MACH_PB1500           2       /* Au1500-based eval board */
-#define  MACH_DB1000           3       /* Au1000-based eval board */
-#define  MACH_DB1100           4       /* Au1100-based eval board */
-#define  MACH_DB1500           5       /* Au1500-based eval board */
-#define  MACH_XXS1500          6       /* Au1500-based eval board */
-#define  MACH_MTX1             7       /* 4G MTX-1 Au1500-based board */
-#define  MACH_PB1550           8       /* Au1550-based eval board */
-#define  MACH_DB1550           9       /* Au1550-based eval board */
-#define  MACH_PB1200           10       /* Au1200-based eval board */
-#define  MACH_DB1200           11       /* Au1200-based eval board */
-
-/*
- * Valid machtype for group NEC_VR41XX
- *
- * Various NEC-based devices.
- *
- * FIXME: MACH_GROUPs should be by _MANUFACTURER_ of * the device, not by
- *        technical properties, so no new additions to this group.
- */
-#define  MACH_NEC_OSPREY       0       /* Osprey eval board */
-#define  MACH_NEC_EAGLE                1       /* NEC Eagle/Hawk board */
-#define  MACH_ZAO_CAPCELLA     2       /* ZAO Networks Capcella */
-#define  MACH_VICTOR_MPC30X    3       /* Victor MP-C303/304 */
-#define  MACH_IBM_WORKPAD      4       /* IBM WorkPad z50 */
-#define  MACH_CASIO_E55                5       /* CASIO CASSIOPEIA E-10/15/55/65 */
-#define  MACH_TANBAC_TB0226    6       /* TANBAC TB0226 (Mbase) */
-#define  MACH_TANBAC_TB0229    7       /* TANBAC TB0229 (VR4131DIMM) */
-#define  MACH_NEC_CMBVR4133    8       /* CMB VR4133 Board */
-
-#define  MACH_HP_LASERJET      1
-
 /*
  * Valid machtype for group LASAT
  */
 #define  MACH_LASAT_100                0       /* Masquerade II/SP100/SP50/SP25 */
 #define  MACH_LASAT_200                1       /* Masquerade PRO/SP200 */
 
-/*
- * Valid machtype for group TITAN
- */
-#define  MACH_TITAN_YOSEMITE   1       /* PMC-Sierra Yosemite          */
-#define  MACH_TITAN_EXCITE     2       /* Basler eXcite                */
-
 /*
  * Valid machtype for group NEC EMMA2RH
  */
 #define  MACH_NEC_MARKEINS     0       /* NEC EMMA2RH Mark-eins        */
 
-/*
- * Valid machtype for group LEMOTE
- */
-#define  MACH_LEMOTE_FULONG        0
-
 /*
  * Valid machtype for group PMC-MSP
  */
@@ -190,14 +94,6 @@
 #define MACH_MSP7120_FPGA       5      /* PMC-Sierra MSP7120 Emulation */
 #define MACH_MSP_OTHER        255      /* PMC-Sierra unknown board type */
 
-#define MACH_WRPPMC             1
-
-/*
- * Valid machtype for group Broadcom
- */
-#define MACH_GROUP_BRCM                23      /* Broadcom                     */
-#define  MACH_BCM47XX          1       /* Broadcom BCM47XX             */
-
 #define CL_SIZE                        COMMAND_LINE_SIZE
 
 const char *get_system_type(void);