summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/files/arch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-11 19:26:20 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-11 19:26:20 +0000
commitb549f7c5f45523bf03f6f46ed1cb509c438f4ae4 (patch)
tree70e157f08ad76e7fd2b2b645c00178777ae910c7 /target/linux/adm5120-2.6/files/arch
parentb22d28f2f9e673ab1660142b1a062aec14ce246b (diff)
[adm5120] fix detection of admboot based boards
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7926 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch')
-rw-r--r--target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
index 97ecc99bc..db8037f3b 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
@@ -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 */