--- a/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Tue Oct 13 01:04:20 2020 +0000
+++ b/src/cs/layer1/tpu_drivers/source0/tpudrv12.h	Tue Oct 13 01:07:46 2020 +0000
@@ -275,7 +275,7 @@
   #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_8 )
   #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0     )
 
-#elif defined(CONFIG_TARGET_GTAMODEM)
+#elif defined(CONFIG_TARGET_GTAMODEM) || defined(CONFIG_TARGET_FCDEV3B)
 
   // Openmoko's triband configuration is a bastardized version
   // of TI's quadband one from Leonardo/E-Sample
@@ -317,60 +317,6 @@
   #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_7 )
   #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0     )
 
-#elif defined(CONFIG_TARGET_FCFAM)
-
-  /*
-   * In our FreeCalypso hw family, we would like to be able to use
-   * both triband and quadband RFFEs.  Our current FCDEV3B is triband,
-   * copied from Openmoko, and the same is expected to be the case for
-   * future low-budget designs, but if someone pays for a new RF layout,
-   * we can use a quadband RFFE instead.  If we ever have two different
-   * hw platforms or variants that differ in the RFFE but are otherwise
-   * firmware-compatible, we would like to have the same fw build
-   * work with both triband and quadband RFFEs.  How is it possible?
-   * The trick is that we define our set of TSPACT RFFE control signals
-   * starting with our current OM-based triband version, and add one
-   * more signal to support potential future quadband designs.
-   */
-
-  #define FEM_RX_1900   BIT_1     // act1
-  #define FEM_TX_HIGH   BIT_2     // act2
-  #define FEM_TX_LOW    BIT_4     // act4
-  #define FEM_RX_850    BIT_5     // act5
-
-  #define PA_HI_BAND    BIT_3   // act3
-  #define PA_LO_BAND    0
-  #define PA_OFF        0
-
-  #define FEM_PINS (FEM_TX_LOW | FEM_TX_HIGH | FEM_RX_850 | FEM_RX_1900)
-
-  #define FEM_OFF    ( FEM_PINS ^ 0 )
-
-  #define FEM_SLEEP  ( 0 )  
-
-  // This configuration is always inverted.
-
-  // RX_UP/DOWN and TX_UP/DOWN
-  #define RU_900     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define RD_900     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define TU_900     ( PA_LO_BAND | FEM_PINS ^ FEM_TX_LOW )
-  #define TD_900     ( PA_OFF     | FEM_PINS ^ 0          )
-
-  #define RU_850     ( PA_OFF     | FEM_PINS ^ FEM_RX_850 )
-  #define RD_850     ( PA_OFF     | FEM_PINS ^ 0          )
-  #define TU_850     ( PA_LO_BAND | FEM_PINS ^ FEM_TX_LOW )
-  #define TD_850     ( PA_OFF     | FEM_PINS ^ 0          )
-
-  #define RU_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define RD_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define TU_1800    ( PA_HI_BAND | FEM_PINS ^ FEM_TX_HIGH )
-  #define TD_1800    ( PA_OFF     | FEM_PINS ^ 0           )
-
-  #define RU_1900    ( PA_OFF     | FEM_PINS ^ FEM_RX_1900 )
-  #define RD_1900    ( PA_OFF     | FEM_PINS ^ 0           )
-  #define TU_1900    ( PA_HI_BAND | FEM_PINS ^ FEM_TX_HIGH )
-  #define TD_1900    ( PA_OFF     | FEM_PINS ^ 0           )
-
 #elif defined(CONFIG_TARGET_MGC2GSMT)
 
   /*