Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=05dc8c02bf40090e9ed23932b1980ead48eb8870
Commit:     05dc8c02bf40090e9ed23932b1980ead48eb8870
Parent:     112b20a1e849aec8077bbf11fc3de338b62f363a
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 23:46:08 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 23:46:08 2007 +0100

    [MIPS] ARC: Get rid of mips_machgroup
    
    This has not been any serious user of this ill conceived thing since the
    original invention in like '95.
    
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/au1000/db1x00/init.c                     |    2 -
 arch/mips/au1000/mtx-1/init.c                      |    1 -
 arch/mips/au1000/pb1000/init.c                     |    1 -
 arch/mips/au1000/pb1100/init.c                     |    1 -
 arch/mips/au1000/pb1200/init.c                     |    1 -
 arch/mips/au1000/pb1500/init.c                     |    1 -
 arch/mips/au1000/pb1550/init.c                     |    1 -
 arch/mips/au1000/xxs1500/init.c                    |    1 -
 arch/mips/basler/excite/excite_prom.c              |    1 -
 arch/mips/cobalt/setup.c                           |    2 -
 arch/mips/dec/prom/identify.c                      |    3 --
 arch/mips/emma2rh/common/prom.c                    |    2 -
 arch/mips/fw/arc/identify.c                        |   10 ------
 arch/mips/gt64120/wrppmc/setup.c                   |    1 -
 arch/mips/jmr3927/rbhma3100/init.c                 |    1 -
 arch/mips/kernel/setup.c                           |    2 -
 arch/mips/lasat/prom.c                             |    2 -
 arch/mips/lemote/lm2e/prom.c                       |    1 -
 arch/mips/philips/pnx8550/jbs/init.c               |    1 -
 arch/mips/philips/pnx8550/stb810/prom_init.c       |    1 -
 arch/mips/pmc-sierra/msp71xx/msp_setup.c           |   15 +---------
 arch/mips/pmc-sierra/yosemite/prom.c               |    1 -
 arch/mips/sibyte/cfe/setup.c                       |    1 -
 arch/mips/sibyte/sb1250/prom.c                     |    1 -
 .../toshiba_rbtx4927/toshiba_rbtx4927_prom.c       |    2 -
 arch/mips/tx4938/toshiba_rbtx4938/prom.c           |    1 -
 arch/mips/vr41xx/nec-cmbvr4133/setup.c             |    1 -
 include/asm-mips/bootinfo.h                        |   30 ++------------------
 28 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 0a3f025..e6bdd07 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -59,8 +59,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
-
        /* Set the platform # */
 #if    defined (CONFIG_MIPS_DB1550)
        mips_machtype = MACH_DB1550;
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index 88f2b6d..2aa7b2e 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -56,7 +56,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_MTX1;      /* set the platform # */
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index e9fa1ba..4535f72 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1000;
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index 6131b56..7ba6852 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg3;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1100;
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index 27f09e3..5a70029 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1200;
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 733d2e4..e58a9d6 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1500;
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index 41daa33..fad53bf 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_PB1550;
 
        prom_init_cmdline();
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index f1c7653..9f839c3 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
        mips_machtype = MACH_XXS1500;   /* set the platform # */
 
        prom_init_cmdline();
diff --git a/arch/mips/basler/excite/excite_prom.c 
b/arch/mips/basler/excite/excite_prom.c
index 6ecd512..2d752c2 100644
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -136,7 +136,6 @@ void __init prom_init(void)
 #      error 64 bit support not implemented
 #endif /* CONFIG_64BIT */
 
-       mips_machgroup = MACH_GROUP_TITAN;
        mips_machtype = MACH_TITAN_EXCITE;
 }
 
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index fc9cbb2..5d2e879 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -114,8 +114,6 @@ void __init prom_init(void)
        unsigned long memsz;
        char **argv;
 
-       mips_machgroup = MACH_GROUP_COBALT;
-
        memsz = fw_arg0 & 0x7fff0000;
        narg = fw_arg0 & 0x0000ffff;
 
diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c
index cd85924..95e26f4 100644
--- a/arch/mips/dec/prom/identify.c
+++ b/arch/mips/dec/prom/identify.c
@@ -133,9 +133,6 @@ void __init prom_identify_arch(u32 magic)
        dec_firmrev = (dec_sysid & 0xff00) >> 8;
        dec_etc = dec_sysid & 0xff;
 
-       /* We're obviously one of the DEC machines */
-       mips_machgroup = MACH_GROUP_DEC;
-
        /*
         * FIXME: This may not be an exhaustive list of DECStations/Servers!
         * Put all model-specific initialisation calls here.
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 7433bd8..0f791eb 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -62,8 +62,6 @@ void __init prom_init(void)
                strcat(arcs_cmdline, " ");
        }
 
-       mips_machgroup = MACH_GROUP_NEC_EMMA2RH;
-
 #if defined(CONFIG_MARKEINS)
        mips_machtype = MACH_NEC_MARKEINS;
        add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 5d28dbe..28dfd2e 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -22,7 +22,6 @@
 struct smatch {
        char *arcname;
        char *liname;
-       int group;
        int type;
        int flags;
 };
@@ -31,49 +30,41 @@ static struct smatch mach_table[] = {
        {
                .arcname        = "SGI-IP22",
                .liname         = "SGI Indy",
-               .group          = MACH_GROUP_SGI,
                .type           = MACH_SGI_IP22,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP27",
                .liname         = "SGI Origin",
-               .group          = MACH_GROUP_SGI,
                .type           = MACH_SGI_IP27,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP28",
                .liname         = "SGI IP28",
-               .group          = MACH_GROUP_SGI,
                .type           = MACH_SGI_IP28,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP30",
                .liname         = "SGI Octane",
-               .group          = MACH_GROUP_SGI,
                .type           = MACH_SGI_IP30,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "SGI-IP32",
                .liname         = "SGI O2",
-               .group          = MACH_GROUP_SGI,
                .type           = MACH_SGI_IP32,
                .flags          = PROM_FLAG_ARCS,
        }, {
                .arcname        = "Microsoft-Jazz",
                .liname         = "Jazz MIPS_Magnum_4000",
-               .group          = MACH_GROUP_JAZZ,
                .type           = MACH_MIPS_MAGNUM_4000,
                .flags          = 0,
        }, {
                .arcname        = "PICA-61",
                .liname         = "Jazz Acer_PICA_61",
-               .group          = MACH_GROUP_JAZZ,
                .type           = MACH_ACER_PICA_61,
                .flags          = 0,
        }, {
                .arcname        = "RM200PCI",
                .liname         = "SNI RM200_PCI",
-               .group          = MACH_GROUP_SNI_RM,
                .type           = MACH_SNI_RM200_PCI,
                .flags          = PROM_FLAG_DONT_FREE_TEMP,
        }
@@ -125,7 +116,6 @@ void __init prom_identify_arch(void)
        mach = string_to_mach(iname);
        system_type = mach->liname;
 
-       mips_machgroup = mach->group;
        mips_machtype = mach->type;
        prom_flags = mach->flags;
 }
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index ed58c13..238b508 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -159,7 +159,6 @@ const char *get_system_type(void)
  */
 void __init prom_init(void)
 {
-       mips_machgroup = MACH_GROUP_WINDRIVER;
        mips_machtype = MACH_WRPPMC;
 
        add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, 
BOOT_MEM_RAM);
diff --git a/arch/mips/jmr3927/rbhma3100/init.c 
b/arch/mips/jmr3927/rbhma3100/init.c
index 9169fab..b643f75 100644
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/jmr3927/rbhma3100/init.c
@@ -51,7 +51,6 @@ void __init prom_init(void)
        if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
                puts("Warning: TX3927 TLB off\n");
 #endif
-       mips_machgroup = MACH_GROUP_TOSHIBA;
 
 #ifdef CONFIG_TOSHIBA_JMR3927
        mips_machtype = MACH_TOSHIBA_JMR3927;
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 316685f..a06a27d 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -51,10 +51,8 @@ EXPORT_SYMBOL(PCI_DMA_BUS_IS_PHYS);
  * These are initialized so they are in the .data section
  */
 unsigned long mips_machtype __read_mostly = MACH_UNKNOWN;
-unsigned long mips_machgroup __read_mostly = MACH_GROUP_UNKNOWN;
 
 EXPORT_SYMBOL(mips_machtype);
-EXPORT_SYMBOL(mips_machgroup);
 
 struct boot_mem_map boot_mem_map;
 
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index 4b80fff..209edcc 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -100,8 +100,6 @@ void __init prom_init(void)
 
        lasat_init_board_info();                /* Read info from EEPROM */
 
-       mips_machgroup = MACH_GROUP_LASAT;
-
        /* Get the command line */
        if (argc > 0) {
                strncpy(arcs_cmdline, argv[0], CL_SIZE-1);
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
index 3efb1cf..8243368 100644
--- a/arch/mips/lemote/lm2e/prom.c
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -57,7 +57,6 @@ void __init prom_init(void)
        arg = (int *)fw_arg1;
        env = (int *)fw_arg2;
 
-       mips_machgroup = MACH_GROUP_LEMOTE;
        mips_machtype = MACH_LEMOTE_FULONG;
 
        prom_init_cmdline();
diff --git a/arch/mips/philips/pnx8550/jbs/init.c 
b/arch/mips/philips/pnx8550/jbs/init.c
index 85f4491..cfd90fa 100644
--- a/arch/mips/philips/pnx8550/jbs/init.c
+++ b/arch/mips/philips/pnx8550/jbs/init.c
@@ -48,7 +48,6 @@ void __init prom_init(void)
 
        unsigned long memsize;
 
-       mips_machgroup = MACH_GROUP_PHILIPS;
        mips_machtype = MACH_PHILIPS_JBS;
 
        //memsize = 0x02800000; /* Trimedia uses memory above */
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c 
b/arch/mips/philips/pnx8550/stb810/prom_init.c
index ea5b4e0..fdb33ed 100644
--- a/arch/mips/philips/pnx8550/stb810/prom_init.c
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -41,7 +41,6 @@ void __init prom_init(void)
 
        prom_init_cmdline();
 
-       mips_machgroup = MACH_GROUP_PHILIPS;
        mips_machtype = MACH_PHILIPS_STB810;
 
        memsize = 0x08000000; /* Trimedia uses memory above */
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c 
b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index 8f69b78..e4cc548 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -176,16 +176,13 @@ void __init prom_init(void)
        case FAMILY_FPGA:
                if (FPGA_IS_MSP4200(revision)) {
                        /* Old-style revision ID */
-                       mips_machgroup = MACH_GROUP_MSP;
                        mips_machtype = MACH_MSP4200_FPGA;
                } else {
-                       mips_machgroup = MACH_GROUP_MSP;
                        mips_machtype = MACH_MSP_OTHER;
                }
                break;
 
        case FAMILY_MSP4200:
-               mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP4200_EVAL)
                mips_machtype  = MACH_MSP4200_EVAL;
 #elif defined(CONFIG_PMC_MSP4200_GW)
@@ -196,12 +193,10 @@ void __init prom_init(void)
                break;
 
        case FAMILY_MSP4200_FPGA:
-               mips_machgroup = MACH_GROUP_MSP;
                mips_machtype  = MACH_MSP4200_FPGA;
                break;
 
        case FAMILY_MSP7100:
-               mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP7120_EVAL)
                mips_machtype = MACH_MSP7120_EVAL;
 #elif defined(CONFIG_PMC_MSP7120_GW)
@@ -212,22 +207,14 @@ void __init prom_init(void)
                break;
 
        case FAMILY_MSP7100_FPGA:
-               mips_machgroup = MACH_GROUP_MSP;
                mips_machtype  = MACH_MSP7120_FPGA;
                break;
 
        default:
                /* we don't recognize the machine */
-               mips_machgroup = MACH_GROUP_UNKNOWN;
                mips_machtype  = MACH_UNKNOWN;
-               break;
-       }
-
-       /* make sure we have the right initialization routine - sanity */
-       if (mips_machgroup != MACH_GROUP_MSP) {
-               ppfinit("Unknown machine group in a "
-                       "MSP initialization routine\n");
                panic("***Bogosity factor five***, exiting\n");
+               break;
        }
 
        prom_init_cmdline();
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c 
b/arch/mips/pmc-sierra/yosemite/prom.c
index 0cd78f0..9b9936d 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -126,7 +126,6 @@ void __init prom_init(void)
                env++;
        }
 
-       mips_machgroup = MACH_GROUP_TITAN;
        mips_machtype = MACH_TITAN_YOSEMITE;
 
        prom_grab_secondary();
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index d842b98..147b7fb 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -339,7 +339,6 @@ void __init prom_init(void)
        /* Not sure this is needed, but it's the safe way. */
        arcs_cmdline[CL_SIZE-1] = 0;
 
-       mips_machgroup = MACH_GROUP_SIBYTE;
        prom_meminit();
 }
 
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index 257c4e6..f07ad3b 100644
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -83,7 +83,6 @@ void __init prom_init(void)
 
        strcpy(arcs_cmdline, "root=/dev/ram0 ");
 
-       mips_machgroup = MACH_GROUP_SIBYTE;
        prom_meminit();
 }
 
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c 
b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
index 9a3a5ba..f3f8685 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
@@ -66,8 +66,6 @@ void __init prom_init(void)
 
        prom_init_cmdline();
 
-       mips_machgroup = MACH_GROUP_TOSHIBA;
-
        if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
                mips_machtype = MACH_TOSHIBA_RBTX4927;
                toshiba_name  = "TX4927";
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c 
b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
index 7dc6a0a..69f21c1 100644
--- 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_machgroup = MACH_GROUP_TOSHIBA;
        mips_machtype = MACH_TOSHIBA_RBTX4938;
 
        msize = tx4938_get_mem_size();
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c 
b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b20b93b..58e4768 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,7 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
 #endif
        set_io_port_base(KSEG1ADDR(0x16000000));
 
-       mips_machgroup = MACH_GROUP_NEC_VR41XX;
        mips_machtype = MACH_NEC_CMBVR4133;
 
 #ifdef CONFIG_PCI
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index efa8158..b2dd9b3 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -15,21 +15,19 @@
 #include <asm/setup.h>
 
 /*
- * The MACH_GROUP_ IDs are the equivalent to PCI vendor IDs; the remaining
- * MACH_ values equivalent to product IDs.  As such the numbers do not
- * necessarily reflect technical relations or similarities between systems.
+ * The MACH_ IDs are sort of equivalent to PCI product IDs.  As such the
+ * numbers do not necessarily reflect technical relations or similarities
+ * between systems.
  */
 
 /*
  * Valid machtype values for group unknown
  */
-#define MACH_GROUP_UNKNOWN      0      /* whatever...                  */
 #define  MACH_UNKNOWN          0       /* whatever...                  */
 
 /*
  * Valid machtype values for group JAZZ
  */
-#define MACH_GROUP_JAZZ                1       /* Jazz                         
*/
 #define  MACH_ACER_PICA_61     0       /* Acer PICA-61 (PICA1)         */
 #define  MACH_MIPS_MAGNUM_4000 1       /* Mips Magnum 4000 "RC4030"    */
 #define  MACH_OLIVETTI_M700    2       /* Olivetti M700-10 (-15 ??)    */
@@ -37,7 +35,6 @@
 /*
  * Valid machtype for group DEC
  */
-#define MACH_GROUP_DEC          2      /* Digital Equipment            */
 #define  MACH_DSUNKNOWN                0
 #define  MACH_DS23100          1       /* DECstation 2100 or 3100      */
 #define  MACH_DS5100           2       /* DECsystem 5100               */
@@ -53,26 +50,22 @@
 /*
  * Valid machtype for group ARC
  */
-#define MACH_GROUP_ARC         3       /* Deskstation                  */
 #define MACH_DESKSTATION_RPC44  0      /* Deskstation rPC44 */
 #define MACH_DESKSTATION_TYNE  1       /* Deskstation Tyne */
 
 /*
  * Valid machtype for group SNI_RM
  */
-#define MACH_GROUP_SNI_RM      4       /* Siemens Nixdorf RM series    */
 #define  MACH_SNI_RM200_PCI    0       /* RM200/RM300/RM400 PCI series */
 
 /*
  * Valid machtype for group ACN
  */
-#define MACH_GROUP_ACN         5
 #define  MACH_ACN_MIPS_BOARD   0       /* ACN MIPS single board        */
 
 /*
  * Valid machtype for group SGI
  */
-#define MACH_GROUP_SGI          6      /* Silicon Graphics             */
 #define  MACH_SGI_IP22         0       /* Indy, Indigo2, Challenge S   */
 #define  MACH_SGI_IP27         1       /* Origin 200, Origin 2000, Onyx 2 */
 #define  MACH_SGI_IP28         2       /* Indigo2 Impact               */
@@ -82,26 +75,22 @@
 /*
  * Valid machtype for group COBALT
  */
-#define MACH_GROUP_COBALT       7      /* Cobalt servers               */
 #define  MACH_COBALT_27                0       /* Proto "27" hardware          
*/
 
 /*
  * Valid machtype for group BAGET
  */
-#define MACH_GROUP_BAGET       9       /* Baget                        */
 #define  MACH_BAGET201         0       /* BT23-201 */
 #define  MACH_BAGET202         1       /* BT23-202 */
 
 /*
  * Cosine boards.
  */
-#define MACH_GROUP_COSINE      10      /* CoSine Orion                 */
 #define  MACH_COSINE_ORION     0
 
 /*
  * Valid machtype for group MOMENCO
  */
-#define MACH_GROUP_MOMENCO     12      /* Momentum Boards              */
 #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) */
@@ -111,7 +100,6 @@
 /*
  * Valid machtype for group PHILIPS
  */
-#define MACH_GROUP_PHILIPS     14
 #define  MACH_PHILIPS_NINO     0       /* Nino */
 #define  MACH_PHILIPS_VELO     1       /* Velo */
 #define  MACH_PHILIPS_JBS      2       /* JBS */
@@ -120,13 +108,11 @@
 /*
  * Valid machtype for group SIBYTE
  */
-#define MACH_GROUP_SIBYTE      16      /* Sibyte / Broadcom */
 #define  MACH_SWARM              0
 
 /*
  * Valid machtypes for group Toshiba
  */
-#define MACH_GROUP_TOSHIBA     17 /* Toshiba Reference Systems TSBREF       */
 #define  MACH_PALLAS           0
 #define  MACH_TOPAS            1
 #define  MACH_JMR              2
@@ -138,7 +124,6 @@
 /*
  * Valid machtype for group Alchemy
  */
-#define MACH_GROUP_ALCHEMY     18      /* AMD 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 */
@@ -160,7 +145,6 @@
  * FIXME: MACH_GROUPs should be by _MANUFACTURER_ of * the device, not by
  *        technical properties, so no new additions to this group.
  */
-#define MACH_GROUP_NEC_VR41XX  19
 #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 */
@@ -171,39 +155,33 @@
 #define  MACH_TANBAC_TB0229    7       /* TANBAC TB0229 (VR4131DIMM) */
 #define  MACH_NEC_CMBVR4133    8       /* CMB VR4133 Board */
 
-#define MACH_GROUP_HP_LJ       20      /* Hewlett Packard LaserJet     */
 #define  MACH_HP_LASERJET      1
 
 /*
  * Valid machtype for group LASAT
  */
-#define MACH_GROUP_LASAT       21
 #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_GROUP_TITAN       22      /* PMC-Sierra Titan             */
 #define  MACH_TITAN_YOSEMITE   1       /* PMC-Sierra Yosemite          */
 #define  MACH_TITAN_EXCITE     2       /* Basler eXcite                */
 
 /*
  * Valid machtype for group NEC EMMA2RH
  */
-#define MACH_GROUP_NEC_EMMA2RH 25      /* NEC EMMA2RH (was 23)         */
 #define  MACH_NEC_MARKEINS     0       /* NEC EMMA2RH Mark-eins        */
 
 /*
  * Valid machtype for group LEMOTE
  */
-#define MACH_GROUP_LEMOTE          27
 #define  MACH_LEMOTE_FULONG        0
 
 /*
  * Valid machtype for group PMC-MSP
  */
-#define MACH_GROUP_MSP         26      /* PMC-Sierra MSP boards/CPUs    */
 #define MACH_MSP4200_EVAL       0      /* PMC-Sierra MSP4200 Evaluation */
 #define MACH_MSP4200_GW         1      /* PMC-Sierra MSP4200 Gateway demo */
 #define MACH_MSP4200_FPGA       2      /* PMC-Sierra MSP4200 Emulation */
@@ -212,7 +190,6 @@
 #define MACH_MSP7120_FPGA       5      /* PMC-Sierra MSP7120 Emulation */
 #define MACH_MSP_OTHER        255      /* PMC-Sierra unknown board type */
 
-#define MACH_GROUP_WINDRIVER   28      /* Windriver boards */
 #define MACH_WRPPMC             1
 
 /*
@@ -226,7 +203,6 @@
 const char *get_system_type(void);
 
 extern unsigned long mips_machtype;
-extern unsigned long mips_machgroup;
 
 #define BOOT_MEM_MAP_MAX       32
 #define BOOT_MEM_RAM           1
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to