From ac718400e0347e4a8872941602c54d88eb46737f Mon Sep 17 00:00:00 2001 From: hauke Date: Fri, 13 Sep 2013 16:00:52 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37970 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/broadcom-diag/src/diag.c | 5 +++-- 1 file 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]; -- cgit v1.2.3