diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2007-07-11 19:26:20 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2007-07-11 19:26:20 +0000 |
commit | e84bafd4c026fec61171a472d33059354763404d (patch) | |
tree | 70e157f08ad76e7fd2b2b645c00178777ae910c7 /target/linux/adm5120-2.6/files/arch/mips | |
parent | 52cc10abb1afba1558f80d639fdee75831e9ddc7 (diff) | |
download | master-187ad058-e84bafd4c026fec61171a472d33059354763404d.tar.gz master-187ad058-e84bafd4c026fec61171a472d33059354763404d.tar.bz2 master-187ad058-e84bafd4c026fec61171a472d33059354763404d.zip |
[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/mips')
-rw-r--r-- | target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | 11 |
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 97ecc99bc9..db8037f3be 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 */ |