mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

adm5120: nuke adm5120_mach_type, use mips_machtype instead

Browse Source 
SVN-Revision: 19003
This commit is contained in:
Gabor Juhos 2010-01-02 15:07:45 +00:00
parent 28fbaf0457
commit 60c6268c01
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/adm5120/files/arch/mips/adm5120/common/adm5120.c
View File

@ -12,7 +12,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
//#include <asm/bootinfo.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_info.h>
@ -24,7 +23,6 @@ unsigned int adm5120_revision;
unsigned int adm5120_package; unsigned int adm5120_package;
unsigned int adm5120_nand_boot; unsigned int adm5120_nand_boot;
unsigned long adm5120_speed; unsigned long adm5120_speed;
unsigned long adm5120_mach_type;
/* /*
* CPU settings detection * CPU settings detection

12
target/linux/adm5120/files/arch/mips/adm5120/common/prom.c
View File

@ -202,35 +202,35 @@ static void __init prom_detect_machtype(void)
{ {
if (bootbase_present()) { if (bootbase_present()) {
adm5120_prom_type = ADM5120_PROM_BOOTBASE; adm5120_prom_type = ADM5120_PROM_BOOTBASE;
adm5120_mach_type = detect_machtype_bootbase(); mips_machtype = detect_machtype_bootbase();
return; return;
} }
if (cfe_present()) { if (cfe_present()) {
adm5120_prom_type = ADM5120_PROM_CFE; adm5120_prom_type = ADM5120_PROM_CFE;
adm5120_mach_type = detect_machtype_cfe(); mips_machtype = detect_machtype_cfe();
return; return;
} }
if (myloader_present()) { if (myloader_present()) {
adm5120_prom_type = ADM5120_PROM_MYLOADER; adm5120_prom_type = ADM5120_PROM_MYLOADER;
adm5120_mach_type = detect_machtype_myloader(); mips_machtype = detect_machtype_myloader();
return; return;
} }
if (routerboot_present()) { if (routerboot_present()) {
adm5120_prom_type = ADM5120_PROM_ROUTERBOOT; adm5120_prom_type = ADM5120_PROM_ROUTERBOOT;
adm5120_mach_type = detect_machtype_routerboot(); mips_machtype = detect_machtype_routerboot();
return; return;
} }
if (generic_prom_present()) { if (generic_prom_present()) {
adm5120_prom_type = ADM5120_PROM_GENERIC; adm5120_prom_type = ADM5120_PROM_GENERIC;
adm5120_mach_type = detect_machtype_generic(); mips_machtype = detect_machtype_generic();
return; return;
} }
adm5120_mach_type = MACH_ADM5120_GENERIC; mips_machtype = MACH_ADM5120_GENERIC;
} }
#ifdef CONFIG_IMAGE_CMDLINE_HACK #ifdef CONFIG_IMAGE_CMDLINE_HACK

3
target/linux/adm5120/files/arch/mips/adm5120/common/setup.c
View File

@ -21,6 +21,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/bootinfo.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/mips_machine.h> #include <asm/mips_machine.h>
@ -106,7 +107,7 @@ static int __init adm5120_board_setup(void)
{ {
adm5120_gpio_init(); adm5120_gpio_init();
mips_machine_setup(adm5120_mach_type); mips_machine_setup(mips_machtype);
return 0; return 0;
} }

2
target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_info.h
View File

@ -37,8 +37,6 @@ extern unsigned int adm5120_package;
extern unsigned long adm5120_memsize; extern unsigned long adm5120_memsize;
extern unsigned long adm5120_mach_type;
#define MACH_ADM5120_GENERIC 0 /* Generic board */ #define MACH_ADM5120_GENERIC 0 /* Generic board */
#define MACH_ADM5120_WP54G_WRT 1 /* Compex WP54G-WRT */ #define MACH_ADM5120_WP54G_WRT 1 /* Compex WP54G-WRT */
#define MACH_ADM5120_WP54 2 /* Compex WP54G/WP54AG/WPP54G/WPP54AG */ #define MACH_ADM5120_WP54 2 /* Compex WP54G/WP54AG/WPP54G/WPP54AG */