aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/broadcom-diag/src
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-09-13 16:00:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-09-13 16:00:52 +0000
commit6c14f5f3a60e017f101d792d94941f061b9c43f2 (patch)
treefa6e12829f50091ff3993337387a0013f4475705 /package/kernel/broadcom-diag/src
parent9141ab0ede2f275ea22f5fa330294c246f58baa5 (diff)
downloadupstream-6c14f5f3a60e017f101d792d94941f061b9c43f2.tar.gz
upstream-6c14f5f3a60e017f101d792d94941f061b9c43f2.tar.bz2
upstream-6c14f5f3a60e017f101d792d94941f061b9c43f2.zip
brcm47xx: do not use GPIO configuration of WRT54G for every unknown Linksys device
Most of the Linksys devices without an own GPIO configuration where detected as WRT54G. On one board this made OpenWrt to boot into failsafe every time, because one GPIO configurated as button was not a button. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 37970
Diffstat (limited to 'package/kernel/broadcom-diag/src')
-rw-r--r--package/kernel/broadcom-diag/src/diag.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/kernel/broadcom-diag/src/diag.c b/package/kernel/broadcom-diag/src/diag.c
index 1d4a4b1180..f3f70504de 100644
--- a/package/kernel/broadcom-diag/src/diag.c
+++ b/package/kernel/broadcom-diag/src/diag.c
@@ -1176,8 +1176,9 @@ static struct platform_t __init *platform_detect_legacy(void)
if (!strcmp(boardtype, "0x0101") && !strcmp(getvar("boot_ver"), "v3.6"))
return &platforms[WRT54G3G];
- /* default to WRT54G */
- return &platforms[WRT54G];
+ /* default to WRT54G if no boot_hw_model is set */
+ if (nvram_get("boot_hw_model") == NULL)
+ return &platforms[WRT54G];
}
if (!strcmp(boardnum, "1024") && !strcmp(boardtype, "0x0446"))
return &platforms[WAP54GV2];