http://downloads.netgear.com/files/GPL/GPL_Source_V361j_DM111PSP_series_consumer_rele...
[bcm963xx.git] / shared / opensource / boardparms / bcm963xx / boardparms.c
old mode 100755 (executable)
new mode 100644 (file)
index 678d307..ad42135
@@ -46,6 +46,8 @@ typedef struct boardparameters
     unsigned short usGpioRj11InnerPair;     /* GPIO pin or not defined */
     unsigned short usGpioRj11OuterPair;     /* GPIO pin or not defined */
     unsigned short usGpioPressAndHoldReset; /* GPIO pin or not defined */
+    unsigned short usGpioPSTN;              /* GPIO pin or not defined */
+    unsigned short usGpioLedDiag;           /* GPIO pin or not defined */
     unsigned short usGpioUartRts;           /* GPIO pin or not defined */
     unsigned short usGpioUartCts;           /* GPIO pin or not defined */
     unsigned short usGpioLedAdsl;           /* GPIO pin or not defined */
@@ -77,1270 +79,10 @@ typedef struct boardparameters
 
 /* Variables */
 #if defined(_BCM96338_) || defined(CONFIG_BCM96338)
-static BOARD_PARAMETERS g_bcm96338sv =
-{
-    "96338SV",                               /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-    BP_NOT_DEFINED,                         /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-static BOARD_PARAMETERS g_bcm96338l2m8m =
-{
-    "96338L-2M-8M",                         /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */    
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-static BOARD_PARAMETERS g_bcm96338gw =
-{
-    "96338W",                               /* szBoardId */
-    {{BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x04,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII},                 /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_1_CHIP,                   /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_GPIO_3_AL,                           /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_HW_DEFINED_AH,                       /* usGpioLedWanData */
-    BP_HW_DEFINED_AH,                       /* usGpioLedPpp */
-    BP_GPIO_4_AH,                           /* usGpioLedPppFail */
-    BP_GPIO_1_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_0_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_GPIO_5_AL,                           /* usGpioSesBtnWireless */    
-    BP_EXT_INTR_0,                          /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-static BOARD_PARAMETERS g_bcm96338e4 =
-{
-    "96338E4",                              /* szBoardId */
-    {{BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x04,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII},                 /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_4_AL,                           /* usGpioLedWanData */
-    BP_GPIO_4_AL,                           /* usGpioLedPpp */
-    BP_GPIO_3_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_1_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_4_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_0_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */    
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-static PBOARD_PARAMETERS g_BoardParms[] =
-    {&g_bcm96338sv, &g_bcm96338l2m8m, &g_bcm96338gw, &g_bcm96338e4, 0};
-#endif
-
-#if defined(_BCM96348_) || defined(CONFIG_BCM96348)
-
-static BOARD_PARAMETERS g_bcm96348r =
-{
-    "96348R",                               /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_8MB_1_CHIP,                   /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_7_AH,                           /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348lv =
-{
-    "96348LV",                               /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_PHY,                 /* ucPhyType */
-      0x02,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_GPIO_5_AL,                         /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED}},                     /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_7_AH,                           /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348gw =
-{
-    "96348GW",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_0,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_35_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED, /* BP_GPIO_0_AL   */    /* usGpioLedSesWireless */
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348w2 =
-{
-    "96348W2",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_0,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_NOT_DEFINED, //BP_GPIO_6_AH,                         /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_AUX,                        /* usAntInUseWireless */
-    BP_GPIO_35_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_GPIO_6_AL,                           /* usGpioLedSesWireless */
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348w3_10 =
-{
-    "96348W3-10",                           /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_0,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_NOT_DEFINED,                       /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_GPIO_2_AL,                           /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_GPIO_4_AH,                           /* usGpioLedPppFail */
-    BP_GPIO_1_AL,                           /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-    BP_GPIO_0_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_AUX,                        /* usAntInUseWireless */
-    BP_GPIO_35_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_GPIO_6_AL,                           /* usGpioLedSesWireless */
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348w3 =
-{
-    "96348W3",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_0,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_AUX,                        /* usAntInUseWireless */
-    BP_GPIO_35_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_GPIO_6_AL,                           /* usGpioLedSesWireless */
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348gw_10 =
-{
-    "96348GW-10",                           /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_GPIO_6_AH,                         /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348gw_11 =
-{
-    "96348GW-11",                           /* szBoardId */
-    {{BP_ENET_NO_PHY},                      /* ucPhyType */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x04,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348sv =
-{
-    "96348SV",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_PHY,                 /* ucPhyType */
-      0x1f,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED}},                     /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-    BP_NOT_DEFINED,                         /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-    BP_NOT_DEFINED,                         /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-
-static BOARD_PARAMETERS g_bcm96348gw_dualDsp =
-{
-    "96348GW-DualDSP",                      /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_UNEQUIPPED,                        /* usGpioVoipReset */
-      BP_GPIO_34_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_DSP,                          /* ucDspType */
-      0x01,                                 /* ucDspAddress */
-      BP_EXT_INTR_3,                        /* usExtIntrVoip */
-      BP_UNEQUIPPED ,                       /* usGpioVoipReset */
-      BP_GPIO_35_AH,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_3}},                            /* usCsVoip */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-
-static BOARD_PARAMETERS g_bcmCustom_01 =
-{
-     "BCMCUST_01",                          /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY,                       /* ucPhyType */
-      0x00,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_DSP,                          /* ucDspType */
-      0x00,                                 /* ucDspAddress */
-      BP_EXT_INTR_2,                        /* usExtIntrVoip */
-      BP_GPIO_36_AH,                        /* usGpioVoipReset */
-      BP_GPIO_34_AL,                        /* usGpioVoipIntr */
-      BP_NOT_DEFINED,                       /* usGpioLedVoip */
-      BP_CS_2},                             /* usCsVoip */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_2_AL,                           /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_3_AL,                           /* usGpioLedWanData */
-    BP_GPIO_3_AL,                           /* usGpioLedPpp */
-    BP_GPIO_4_AL,                           /* usGpioLedPppFail */
-    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_3_AL,                           /* usGpioLedBlResetCfg */
-    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
-    BP_NOT_DEFINED,                         /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348m =
-{
-    "96348M",                               /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_19_AL,                          /* usGpioLedWanData */
-    BP_GPIO_19_AL,                          /* usGpioLedPpp */
-    BP_GPIO_20_AL,                          /* usGpioLedPppFail */
-    BP_GPIO_16_AL,                          /* usGpioLedBlPowerOn */
-    BP_GPIO_19_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_17_AL,                          /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */
-    BP_CS_1,                                /* usCsHpi */
-    BP_GPIO_22_AL,                          /* usVcopeResetGpio */
-    BP_GPIO_21_AL,                          /* usVcopeRelayGpio */
-    3,                                      /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96348mc =
-{
-    "96348MC",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_NO_PHY}},                     /* ucPhyType */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_2_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_GPIO_33_AL,                          /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_27_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
-    BP_GPIO_25_AL,                          /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-    BP_NOT_DEFINED,                         /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_NOT_DEFINED,                         /* usAntInUseWireless */
-    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */
-    BP_CS_1,                                /* usCsHpi */
-    BP_GPIO_22_AL,                          /* usVcopeResetGpio */
-    BP_GPIO_36_AL,                          /* usVcopeRelayGpio */
-    3,                                      /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static PBOARD_PARAMETERS g_BoardParms[] =
-    {&g_bcm96348r, &g_bcm96348lv, &g_bcm96348gw, &g_bcm96348w2, &g_bcm96348w3_10,
-     &g_bcm96348w3, &g_bcm96348gw_10, &g_bcm96348gw_11, &g_bcm96348sv,
-     &g_bcm96348gw_dualDsp, &g_bcmCustom_01, &g_bcm96348m, &g_bcm96348mc, 0};
-#endif
-
-#if defined(_BCM96358_) || defined(CONFIG_BCM96358)
-
-static BOARD_PARAMETERS g_bcm96358vw2 =
-{
-    "96358VW2",                             /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_GPIO_28_AL,                        /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_GPIO_22_AL,                          /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_GPIO_23_AH,                          /* usGpioLedPppFail */
-    BP_GPIO_5_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_22_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_4_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    1,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_EXT_INTR_2,                          /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96358vw =
-{
-    "96358VW",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_15_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_22_AL,                          /* usGpioLedWanData */
-    BP_GPIO_22_AL,                          /* usGpioLedPpp */
-    BP_GPIO_23_AL,                          /* usGpioLedPppFail */
-    BP_GPIO_4_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_22_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_5_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    1,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96358vw16 =
-{
-    "96358VW-16",                           /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_15_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_22_AL,                          /* usGpioLedWanData */
-    BP_GPIO_22_AL,                          /* usGpioLedPpp */
-    BP_GPIO_23_AL,                          /* usGpioLedPppFail */
-    BP_GPIO_4_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_22_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_5_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    1,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
-static BOARD_PARAMETERS g_bcm96358gw =
-{
-    "96358GW",                              /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_15_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_22_AL,                          /* usGpioLedWanData */
-    BP_GPIO_22_AL,                          /* usGpioLedPpp */
-    BP_GPIO_23_AL,                          /* usGpioLedPppFail */
-    BP_GPIO_4_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_22_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_5_AL,                           /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
-    BP_NOT_DEFINED,                         /* usCsHpi */
-    BP_NOT_DEFINED,                         /* usVcopeResetGpio */
-    BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
-    BP_NOT_DEFINED,                         /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
 
-static BOARD_PARAMETERS g_bcm96358sv =
+static BOARD_PARAMETERS g_bcmRTA1320_16M =
 {
-    "96358SV",                              /* szBoardId */
+    "RTA1320_16M",                          /* szBoardId */
     {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
       0x01,                                 /* ucPhyAddress */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
@@ -1353,43 +95,51 @@ static BOARD_PARAMETERS g_bcm96358sv =
       BP_ENET_CONFIG_MDIO,                  /* usConfigType */
       BP_NOT_DEFINED},                      /* usReverseMii */
      {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0                                 /* ucPhyAddress */
+      0x00,                                 /* ucPhyAddress */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
       BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
       BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
       BP_NOT_DEFINED,                       /* usGpioPhyReset */
       BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
+      0x04,                                 /* numSwitchPorts */
+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
       BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
+    {{BP_VOIP_DSP,                          /* ucDspType */
+      0x00,                                 /* ucDspAddress */
+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
+      BP_GPIO_36_AH,                        /* usGpioVoipReset */
+      BP_GPIO_34_AL,                        /* usGpioVoipIntr */
+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
+      BP_CS_2},                             /* usCsVoip */
      {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_1_CHIP,                  /* usSdramSize */
+    BP_MEMORY_16MB_1_CHIP,                   /* usSdramSize */
     BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
     BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
     BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
+    BP_GPIO_7_AL,                           /* usGpioPressAndHoldReset */
+    BP_NOT_DEFINED,                         /* usGpioPSTN */
+    BP_GPIO_1_AL,                           /* usGpioLedDiag */
     BP_NOT_DEFINED,                         /* usGpioUartRts */
     BP_NOT_DEFINED,                         /* usGpioUartCts */
     BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_15_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
+    BP_GPIO_11_AL,                          /* usGpioLedWireless */
     BP_NOT_DEFINED,                         /* usGpioLedUsb */
     BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                          /* usGpioLedWanData */
-    BP_NOT_DEFINED,                          /* usGpioLedPpp */
-    BP_NOT_DEFINED,                          /* usGpioLedPppFail */
-    BP_NOT_DEFINED,                           /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                          /* usGpioLedBlResetCfg */
-    BP_NOT_DEFINED,                           /* usGpioLedBlStop */
+    BP_GPIO_4_AL,                           /* usGpioLedWanData */
+    BP_GPIO_4_AL,                           /* usGpioLedPpp */
+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
+    BP_GPIO_7_AL,                           /* usGpioLedBlResetCfg */
+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
     BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
     BP_NOT_DEFINED,                         /* usExtIntrHpna */
     BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */    
+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
+    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
     BP_NOT_DEFINED,                         /* usCsHpi */
     BP_NOT_DEFINED,                         /* usVcopeResetGpio */
     BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
@@ -1399,9 +149,9 @@ static BOARD_PARAMETERS g_bcm96358sv =
     BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
 };
 
-static BOARD_PARAMETERS g_bcm96358gw16 =
+static BOARD_PARAMETERS g_bcmRTA1320B_16M =
 {
-    "96358GW-16",                           /* szBoardId */
+    "RTA1320B_16M",                         /* szBoardId */
     {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
       0x01,                                 /* ucPhyAddress */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
@@ -1414,43 +164,51 @@ static BOARD_PARAMETERS g_bcm96358gw16 =
       BP_ENET_CONFIG_MDIO,                  /* usConfigType */
       BP_NOT_DEFINED},                      /* usReverseMii */
      {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0                                 /* ucPhyAddress */
+      0x00,                                 /* ucPhyAddress */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
       BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
       BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
       BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
       BP_NOT_DEFINED,                       /* usGpioPhyReset */
       BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
+      0x04,                                 /* numSwitchPorts */
+      BP_ENET_CONFIG_SPI_SSB_1,             /* usConfigType */
       BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
+    {{BP_VOIP_DSP,                          /* ucDspType */
+      0x00,                                 /* ucDspAddress */
+      BP_EXT_INTR_2,                        /* usExtIntrVoip */
+      BP_GPIO_36_AH,                        /* usGpioVoipReset */
+      BP_GPIO_34_AL,                        /* usGpioVoipIntr */
+      BP_NOT_DEFINED,                       /* usGpioLedVoip */
+      BP_CS_2},                             /* usCsVoip */
      {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_16MB_1_CHIP,                  /* usSdramSize */
+    BP_MEMORY_16MB_1_CHIP,                   /* usSdramSize */
     BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
     BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
     BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
+    BP_GPIO_7_AL,                           /* usGpioPressAndHoldReset */
+    BP_NOT_DEFINED,                         /* usGpioPSTN */
+    BP_GPIO_1_AL,                           /* usGpioLedDiag */
     BP_NOT_DEFINED,                         /* usGpioUartRts */
     BP_NOT_DEFINED,                         /* usGpioUartCts */
     BP_NOT_DEFINED,                         /* usGpioLedAdsl */
-    BP_GPIO_15_AL,                          /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
+    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
+    BP_GPIO_11_AL,                          /* usGpioLedWireless */
     BP_NOT_DEFINED,                         /* usGpioLedUsb */
     BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_GPIO_22_AL,                          /* usGpioLedWanData */
-    BP_GPIO_22_AL,                          /* usGpioLedPpp */
-    BP_GPIO_23_AL,                          /* usGpioLedPppFail */
-    BP_GPIO_4_AL,                           /* usGpioLedBlPowerOn */
-    BP_GPIO_22_AL,                          /* usGpioLedBlResetCfg */
-    BP_GPIO_5_AL,                           /* usGpioLedBlStop */
+    BP_GPIO_4_AL,                           /* usGpioLedWanData */
+    BP_GPIO_4_AL,                           /* usGpioLedPpp */
+    BP_NOT_DEFINED,                         /* usGpioLedPppFail */
+    BP_GPIO_0_AL,                           /* usGpioLedBlPowerOn */
+    BP_GPIO_7_AL,                           /* usGpioLedBlResetCfg */
+    BP_GPIO_1_AL,                           /* usGpioLedBlStop */
     BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
     BP_NOT_DEFINED,                         /* usExtIntrHpna */
     BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_SERIAL_GPIO_7_AL,                    /* usGpioLedSesWireless */     
+    BP_NOT_DEFINED,                         /* usAntInUseWireless */
+    BP_NOT_DEFINED,                         /* usGpioSesBtnWireless */    
+    BP_NOT_DEFINED,                         /* usExtIntrSesBtnWireless */
+    BP_NOT_DEFINED,                         /* usGpioLedSesWireless */     
     BP_NOT_DEFINED,                         /* usCsHpi */
     BP_NOT_DEFINED,                         /* usVcopeResetGpio */
     BP_NOT_DEFINED,                         /* usVcopeRelayGpio */
@@ -1460,69 +218,8 @@ static BOARD_PARAMETERS g_bcm96358gw16 =
     BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
 };
 
-static BOARD_PARAMETERS g_bcm96358m =
-{
-    "96358M",                               /* szBoardId */
-    {{BP_ENET_INTERNAL_PHY,                 /* ucPhyType */
-      0x01,                                 /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x01,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO,                  /* usConfigType */
-      BP_NOT_DEFINED},                      /* usReverseMii */
-     {BP_ENET_EXTERNAL_SWITCH,              /* ucPhyType */
-      0x0,                                  /* ucPhyAddress */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSck */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiSs */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMosi */
-      BP_NOT_DEFINED,                       /* usGpioPhySpiMiso */
-      BP_NOT_DEFINED,                       /* usGpioPhyReset */
-      BP_NOT_DEFINED,                       /* usGpioPhyLinkSpeed */
-      0x03,                                 /* numSwitchPorts */
-      BP_ENET_CONFIG_MDIO_PSEUDO_PHY,       /* usConfigType */
-      BP_ENET_REVERSE_MII}},                /* usReverseMii */
-    {{BP_VOIP_NO_DSP},                      /* ucDspType */
-     {BP_VOIP_NO_DSP}},                     /* ucDspType */
-    BP_MEMORY_32MB_1_CHIP,                  /* usSdramSize */
-    BP_PSI_DEFAULT_SIZE,                    /* usPsiSize */
-    BP_NOT_DEFINED,                         /* usGpioRj11InnerPair */
-    BP_NOT_DEFINED,                         /* usGpioRj11OuterPair */
-    BP_NOT_DEFINED,                         /* usGpioPressAndHoldReset */
-    BP_NOT_DEFINED,                         /* usGpioUartRts */
-    BP_NOT_DEFINED,                         /* usGpioUartCts */
-    BP_SERIAL_GPIO_3_AL,                    /* usGpioLedAdsl */
-    BP_NOT_DEFINED,                         /* usGpioLedAdslFail */
-    BP_NOT_DEFINED,                         /* usGpioLedWireless */
-    BP_NOT_DEFINED,                         /* usGpioLedUsb */
-    BP_NOT_DEFINED,                         /* usGpioLedHpna */
-    BP_NOT_DEFINED,                         /* usGpioLedWanData */
-    BP_NOT_DEFINED,                         /* usGpioLedPpp */
-    BP_SERIAL_GPIO_2_AH,                    /* usGpioLedPppFail */
-    BP_SERIAL_GPIO_0_AH,                    /* usGpioLedBlPowerOn */
-    BP_NOT_DEFINED,                         /* usGpioLedBlResetCfg */
-    BP_SERIAL_GPIO_1_AH,                    /* usGpioLedBlStop */
-    BP_HW_DEFINED,                          /* usExtIntrAdslDyingGasp */
-    BP_NOT_DEFINED,                         /* usExtIntrHpna */
-    BP_NOT_DEFINED,                         /* usCsHpna */
-    BP_WLAN_ANT_MAIN,                       /* usAntInUseWireless */
-    BP_GPIO_37_AL,                          /* usGpioSesBtnWireless */
-    BP_EXT_INTR_3,                          /* usExtIntrSesBtnWireless */
-    BP_GPIO_11_AL,                          /* usGpioLedSesWireless */ 
-    BP_CS_1,                                /* usCsHpi */
-    BP_GPIO_9_AL,                           /* usVcopeResetGpio */
-    BP_GPIO_10_AL,                          /* usVcopeRelayGpio */
-    3,                                      /* usVcopeBoardRev */
-    0,                                      /* usCMTThead */
-    0,                                      /* WLAN flags */
-    BP_NOT_DEFINED,                         /* usExtIntrPressAndHoldReset */
-};
-
 static PBOARD_PARAMETERS g_BoardParms[] =
-    {&g_bcm96358sv, &g_bcm96358vw, &g_bcm96358vw16, &g_bcm96358gw, &g_bcm96358gw16, &g_bcm96358m, &g_bcm96358vw2, 0};
+    {&g_bcmRTA1320_16M, &g_bcmRTA1320B_16M, 0};
 #endif
 
 static PBOARD_PARAMETERS g_pCurrentBp = 0;
@@ -2684,6 +1381,23 @@ int BpGetVoipLedGpio( unsigned short *pusValue )
         *pusValue = BP_NOT_DEFINED;
         nRet = BP_BOARD_ID_NOT_SET;
     }
+//swda add,06/23/2006
+       if ( g_pCurrentBp ) {
+               //RTA1405VW(6358) use GPIO15 as VOIP ready led
+               if ( bpstrcmp( g_pCurrentBp->szBoardId, "RTA1405VW" ) == 0 || 
+                    bpstrcmp( g_pCurrentBp->szBoardId, "RTA1405BVW" ) == 0 ||
+                    bpstrcmp( g_pCurrentBp->szBoardId, "RTA1425VW" ) == 0  ||
+                    bpstrcmp( g_pCurrentBp->szBoardId, "RTA1425BVW" ) == 0 ||
+                    bpstrcmp( g_pCurrentBp->szBoardId, "RTF2035VW" ) == 0  ) {
+                       *pusValue = BP_GPIO_15_AL;
+                       nRet = BP_SUCCESS;
+               } else if ( bpstrcmp( g_pCurrentBp->szBoardId, "RTV1405VW" ) == 0 ||
+                           bpstrcmp( g_pCurrentBp->szBoardId, "RTV1405BVW" ) == 0 ) {
+                       *pusValue = BP_SERIAL_GPIO_5_AL;
+                       nRet = BP_SUCCESS;
+               }
+       }
+//swda add end
 
     return( nRet );
 } /* BpGetVoipLedGpio */
@@ -3019,3 +1733,84 @@ int BpGetPressAndHoldResetExtIntr( unsigned short *pusValue )
                
 } /* BpGetPressAndHoldResetExtIntr */
 
+/**************************************************************************
+ * Name       : BpGetDiagLedGpio
+ *
+ * Description: This function returns the GPIO pin assignment for the Diag
+ *              LED.
+ *
+ * Parameters : [OUT] pusValue - Address of short word that the Diag LED
+ *                  GPIO pin is returned in.
+ *
+ * Returns    : BP_SUCCESS - Success, value is returned.
+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
+ *                  for the board.
+ ***************************************************************************/
+int BpGetDiagLedGpio( unsigned short *pusValue )
+{
+    int nRet;
+
+    if( g_pCurrentBp )
+    {
+        *pusValue = g_pCurrentBp->usGpioLedDiag;
+
+        if( g_pCurrentBp->usGpioLedDiag != BP_NOT_DEFINED )
+        {
+            nRet = BP_SUCCESS;
+        }
+        else
+        {
+            nRet = BP_VALUE_NOT_DEFINED;
+        }
+    }
+    else
+    {
+        *pusValue = BP_NOT_DEFINED;
+        nRet = BP_BOARD_ID_NOT_SET;
+    }
+
+    return( nRet );
+} /* BpGetDiagLedGpio */
+
+/**************************************************************************
+ * Name       : BpGetPSTNGpio
+ *
+ * Description: This function returns the GPIO pin assignment for switch PSTN.
+ *
+ * Parameters : [OUT] pusValue - Address of short word that the PSTN
+ *
+ * Returns    : BP_SUCCESS - Success, value is returned.
+ *              BP_BOARD_ID_NOT_SET - Error, BpSetBoardId has not been called.
+ *              BP_VALUE_NOT_DEFINED - At least one return value is not defined
+ *                  for the board.
+ ***************************************************************************/
+int BpGetPSTNGpio( unsigned short *pusValue )
+{
+    int nRet;
+
+    if( g_pCurrentBp )
+    {
+        *pusValue = g_pCurrentBp->usGpioPSTN;
+
+        if( g_pCurrentBp->usGpioPSTN != BP_NOT_DEFINED )
+        {
+            nRet = BP_SUCCESS;
+        }
+        else
+        {
+            nRet = BP_VALUE_NOT_DEFINED;
+        }
+    }
+    else
+    {
+        *pusValue = BP_NOT_DEFINED;
+        nRet = BP_BOARD_ID_NOT_SET;
+    }
+
+    return( nRet );
+} /* BpGetPSTNGpio */
+
+
+
+