Changeset 19003


Ignore:
Timestamp:
2010-01-02T16:07:45+01:00 (8 years ago)
Author:
juhosg
Message:

adm5120: nuke adm5120_mach_type, use mips_machtype instead

Location:
trunk/target/linux/adm5120/files/arch/mips
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c

    r15245 r19003  
    1313#include <linux/io.h> 
    1414 
    15 //#include <asm/bootinfo.h> 
    1615#include <asm/addrspace.h> 
    1716 
     
    2524unsigned int adm5120_nand_boot; 
    2625unsigned long adm5120_speed; 
    27 unsigned long adm5120_mach_type; 
    2826 
    2927/* 
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c

    r19000 r19003  
    203203        if (bootbase_present()) { 
    204204                adm5120_prom_type = ADM5120_PROM_BOOTBASE; 
    205                 adm5120_mach_type = detect_machtype_bootbase(); 
     205                mips_machtype = detect_machtype_bootbase(); 
    206206                return; 
    207207        } 
     
    209209        if (cfe_present()) { 
    210210                adm5120_prom_type = ADM5120_PROM_CFE; 
    211                 adm5120_mach_type = detect_machtype_cfe(); 
     211                mips_machtype = detect_machtype_cfe(); 
    212212                return; 
    213213        } 
     
    215215        if (myloader_present()) { 
    216216                adm5120_prom_type = ADM5120_PROM_MYLOADER; 
    217                 adm5120_mach_type = detect_machtype_myloader(); 
     217                mips_machtype = detect_machtype_myloader(); 
    218218                return; 
    219219        } 
     
    221221        if (routerboot_present()) { 
    222222                adm5120_prom_type = ADM5120_PROM_ROUTERBOOT; 
    223                 adm5120_mach_type = detect_machtype_routerboot(); 
     223                mips_machtype = detect_machtype_routerboot(); 
    224224                return; 
    225225        } 
     
    227227        if (generic_prom_present()) { 
    228228                adm5120_prom_type = ADM5120_PROM_GENERIC; 
    229                 adm5120_mach_type = detect_machtype_generic(); 
    230                 return; 
    231         } 
    232  
    233         adm5120_mach_type = MACH_ADM5120_GENERIC; 
     229                mips_machtype = detect_machtype_generic(); 
     230                return; 
     231        } 
     232 
     233        mips_machtype = MACH_ADM5120_GENERIC; 
    234234} 
    235235 
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c

    r16559 r19003  
    2222#include <linux/io.h> 
    2323 
     24#include <asm/bootinfo.h> 
    2425#include <asm/reboot.h> 
    2526#include <asm/time.h> 
     
    107108        adm5120_gpio_init(); 
    108109 
    109         mips_machine_setup(adm5120_mach_type); 
     110        mips_machine_setup(mips_machtype); 
    110111 
    111112        return 0; 
  • trunk/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h

    r16555 r19003  
    3737 
    3838extern unsigned long adm5120_memsize; 
    39  
    40 extern unsigned long adm5120_mach_type; 
    4139 
    4240#define MACH_ADM5120_GENERIC    0       /* Generic board */ 
Note: See TracChangeset for help on using the changeset viewer.