mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:09:53 +02:00
[adm5120] fix detection of admboot based boards
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7926 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
b22d28f2f9
commit
b549f7c5f4
@ -110,7 +110,7 @@ static unsigned long __init detect_machtype_generic(void)
|
||||
{
|
||||
char *name;
|
||||
|
||||
name = generic_prom_getenv("board");
|
||||
name = generic_prom_getenv("board_name");
|
||||
return find_machtype_byname(name);
|
||||
}
|
||||
|
||||
@ -228,8 +228,13 @@ static void __init prom_detect_machtype(void)
|
||||
return;
|
||||
}
|
||||
|
||||
adm5120_prom_type = ADM5120_PROM_GENERIC;
|
||||
mips_machtype = detect_machtype_generic();
|
||||
if (generic_prom_present()) {
|
||||
adm5120_prom_type = ADM5120_PROM_GENERIC;
|
||||
mips_machtype = detect_machtype_generic();
|
||||
return;
|
||||
}
|
||||
|
||||
mips_machtype = MACH_ADM5120_GENERIC;
|
||||
}
|
||||
|
||||
/* TODO: this is an ugly hack for RouterBOARDS */
|
||||
|
Loading…
Reference in New Issue
Block a user