aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/broadcom-diag
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-09-13 16:00:52 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-09-13 16:00:52 +0000
commit4bb1ea5172d3e0988b0016c4209e903734563384 (patch)
tree9ab4212fca6fdad748adf2a1715c08d2ba6ba844 /package/kernel/broadcom-diag
parent5b7ac1346a93dee900afed99e2569103a4bd1239 (diff)
downloadupstream-4bb1ea5172d3e0988b0016c4209e903734563384.tar.gz
upstream-4bb1ea5172d3e0988b0016c4209e903734563384.tar.bz2
upstream-4bb1ea5172d3e0988b0016c4209e903734563384.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37970 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/broadcom-diag')
-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];