On 01/06/2013 12:19 AM, Nathan Hintz wrote:
> Special handling for Linksys E3000v1 is no longer required. WRT610Nv2 uses
> the same H/W and should be the same.
>
> Only tested on E3000v1.
>
> Signed-off-by: Nathan Hintz <nlhi...@hotmail.com>
>
> Index: package/broadcom-diag/src/diag.c
> ===================================================================
> --- package/broadcom-diag/src/diag.c (revision 35017)
> +++ package/broadcom-diag/src/diag.c (working copy)
> @@ -1130,19 +1130,6 @@
> return &platforms[WRT600N];
> }
>
> - /*
> - * Normally, these would go inside the "CFE based - newer hardware"
> block below; however, during early init, the
> - * "pmon_ver" variable is not available on the E3000v1 (and probably
> the WRT610Nv2 also). Until this is figured out,
> - * these will need to remain here in order for platform detection to
> work.
> - */
> - if (!strcmp(boardnum, "42")) { /* Linksys */
> - if (!strcmp(boardtype, "0x04cf") &&
> !strcmp(getvar("boot_hw_model"), "E300") && !strcmp(getvar("boot_hw_ver"),
> "1.0"))
> - return &platforms[E3000V1];
> -
> - if (!strcmp(boardtype, "0x04cf") &&
> !strcmp(getvar("boot_hw_model"), "WRT610N") && !strcmp(getvar("boot_hw_ver"),
> "2.0"))
> - return &platforms[WRT610NV2];
> - }
> -
> if (startswith(getvar("pmon_ver"), "CFE")) {
> /* CFE based - newer hardware */
> if (!strcmp(boardnum, "42")) { /* Linksys */
> @@ -1183,6 +1170,17 @@
> }
> }
>
> + if (!strcmp(boardtype, "0x04cf")) {
> + if (!strcmp(getvar("boot_hw_model"), "E300")) {
> + if (!strcmp(getvar("boot_hw_ver"),
> "1.0"))
> + return &platforms[E3000V1];
> + }
> + else if (!strcmp(getvar("boot_hw_model"),
> "WRT610N")) {
> + if (!strcmp(getvar("boot_hw_ver"),
> "2.0"))
> + return &platforms[WRT610NV2];
> + }
> + }
> +
> /* default to WRT54G */
> return &platforms[WRT54G];
> }
>
I will drop this patch because now the kernel is asked to detect these
devices, see r35764.
Hauke
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
