From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 11 Jul 2007 19:26:20 +0000 (+0000)
Subject: [adm5120] fix detection of admboot based boards
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3c28f8e168bf3174b0230f76f9b23d73be32f96f;hp=79b6c08c351fec7635a35f13f8fcc6e71e986ef9;ds=sidebyside

[adm5120] fix detection of admboot based boards

SVN-Revision: 7926
---

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 */