--- a/configs/2092	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/2092	Wed Jan 17 22:53:14 2018 +0000
@@ -8,7 +8,20 @@
 # ("low cost" unregulated chargers, not used on any FC-supported
 # target devices) to our own FCHG.
 
-scripts/config-headers.sh gprs 2092-fchg
+GPRS=1
+MMI=2
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=1
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat2
 GPF=gpf2
@@ -17,11 +30,6 @@
 ACI=aci2
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=2
-SRVC=1
-export GPRS MMI SRVC
-
 blob_lib_std ccddata
 
 # ACI libs