From b1d970fd1d76068a27c8fd33b8df224c360a1c4c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 11 Jul 2007 19:26:20 +0000 Subject: [PATCH] fix detection of admboot based boards SVN-Revision: 7926 --- .../linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | 11 ++++++++--- 1 file 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 97ecc99bc9e7..db8037f3beed 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 */ -- 2.30.2