diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-02 15:07:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-02 15:07:45 +0000 |
| commit | 60c6268c01a9a1412eed730ada4225906000b015 (patch) | |
| tree | a611c4021b3b5082363a8aedff8d468ec4fe02f8 /target/linux | |
| parent | 28fbaf0457bbf99f94e5a9175d6e286e2cf63ff0 (diff) | |
| download | master-31e0f0ae-60c6268c01a9a1412eed730ada4225906000b015.tar.gz master-31e0f0ae-60c6268c01a9a1412eed730ada4225906000b015.tar.bz2 master-31e0f0ae-60c6268c01a9a1412eed730ada4225906000b015.zip | |
adm5120: nuke adm5120_mach_type, use mips_machtype instead
SVN-Revision: 19003
Diffstat (limited to 'target/linux')
4 files changed, 8 insertions, 11 deletions
diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c b/target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c index 3b969ce6e8..28388342c6 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c @@ -12,7 +12,6 @@ #include <linux/init.h> #include <linux/io.h> -//#include <asm/bootinfo.h> #include <asm/addrspace.h> #include <asm/mach-adm5120/adm5120_info.h> @@ -24,7 +23,6 @@ unsigned int adm5120_revision; unsigned int adm5120_package; unsigned int adm5120_nand_boot; unsigned long adm5120_speed; -unsigned long adm5120_mach_type; /* * CPU settings detection diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c index adc9e8c71a..81ba365a0e 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/common/prom.c @@ -202,35 +202,35 @@ static void __init prom_detect_machtype(void) { if (bootbase_present()) { adm5120_prom_type = ADM5120_PROM_BOOTBASE; - adm5120_mach_type = detect_machtype_bootbase(); + mips_machtype = detect_machtype_bootbase(); return; } if (cfe_present()) { adm5120_prom_type = ADM5120_PROM_CFE; - adm5120_mach_type = detect_machtype_cfe(); + mips_machtype = detect_machtype_cfe(); return; } if (myloader_present()) { adm5120_prom_type = ADM5120_PROM_MYLOADER; - adm5120_mach_type = detect_machtype_myloader(); + mips_machtype = detect_machtype_myloader(); return; } if (routerboot_present()) { adm5120_prom_type = ADM5120_PROM_ROUTERBOOT; - adm5120_mach_type = detect_machtype_routerboot(); + mips_machtype = detect_machtype_routerboot(); return; } if (generic_prom_present()) { adm5120_prom_type = ADM5120_PROM_GENERIC; - adm5120_mach_type = detect_machtype_generic(); + mips_machtype = detect_machtype_generic(); return; } - adm5120_mach_type = MACH_ADM5120_GENERIC; + mips_machtype = MACH_ADM5120_GENERIC; } #ifdef CONFIG_IMAGE_CMDLINE_HACK diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c b/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c index 271dfaa6b4..843a616bbe 100644 --- a/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c +++ b/target/linux/adm5120/files/arch/mips/adm5120/common/setup.c @@ -21,6 +21,7 @@ #include <linux/kernel.h> #include <linux/io.h> +#include <asm/bootinfo.h> #include <asm/reboot.h> #include <asm/time.h> #include <asm/mips_machine.h> @@ -106,7 +107,7 @@ static int __init adm5120_board_setup(void) { adm5120_gpio_init(); - mips_machine_setup(adm5120_mach_type); + mips_machine_setup(mips_machtype); return 0; } diff --git a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h index 7cc18ebd4e..af0cc30ea7 100644 --- a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h +++ b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h @@ -37,8 +37,6 @@ extern unsigned int adm5120_package; extern unsigned long adm5120_memsize; -extern unsigned long adm5120_mach_type; - #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 */ |