FreeCalypso > hg > fc-magnetite

changeset 144:fd8227e3047d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config headers overhaul
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 09 Oct 2016 05:53:14 +0000
parents 1fd7359da77a
children 246f4a7dd92b
files cfg-headers/2091-pruned/board.cfg cfg-headers/2091-pruned/chipset.cfg cfg-headers/2091-pruned/debug.cfg cfg-headers/2091-pruned/dio.cfg cfg-headers/2091-pruned/ffs.cfg cfg-headers/2091-pruned/l1sw.cfg cfg-headers/2091-pruned/mdc.cfg cfg-headers/2091-pruned/r2d.cfg cfg-headers/2091-pruned/rf.cfg cfg-headers/2091-pruned/rv.cfg cfg-headers/2091-pruned/rv_swe.h cfg-headers/2091-pruned/swconfig.cfg cfg-headers/2091-pruned/sys.cfg cfg-headers/2091-pruned/trace.cfg cfg-headers/2091/board.cfg cfg-headers/2091/chipset.cfg cfg-headers/2091/debug.cfg cfg-headers/2091/dio.cfg cfg-headers/2091/ffs.cfg cfg-headers/2091/l1sw.cfg cfg-headers/2091/mdc.cfg cfg-headers/2091/r2d.cfg cfg-headers/2091/rf.cfg cfg-headers/2091/rv.cfg cfg-headers/2091/rv_swe.h cfg-headers/2091/swconfig.cfg cfg-headers/2091/sys.cfg cfg-headers/2091/trace.cfg cfg-headers/2092-pruned/board.cfg cfg-headers/2092-pruned/chipset.cfg cfg-headers/2092-pruned/debug.cfg cfg-headers/2092-pruned/dio.cfg cfg-headers/2092-pruned/ffs.cfg cfg-headers/2092-pruned/l1sw.cfg cfg-headers/2092-pruned/mdc.cfg cfg-headers/2092-pruned/r2d.cfg cfg-headers/2092-pruned/rf.cfg cfg-headers/2092-pruned/rv.cfg cfg-headers/2092-pruned/rv_swe.h cfg-headers/2092-pruned/swconfig.cfg cfg-headers/2092-pruned/sys.cfg cfg-headers/2092-pruned/trace.cfg cfg-headers/2092/board.cfg cfg-headers/2092/chipset.cfg cfg-headers/2092/debug.cfg cfg-headers/2092/dio.cfg cfg-headers/2092/ffs.cfg cfg-headers/2092/l1sw.cfg cfg-headers/2092/mdc.cfg cfg-headers/2092/r2d.cfg cfg-headers/2092/rf.cfg cfg-headers/2092/rv.cfg cfg-headers/2092/rv_swe.h cfg-headers/2092/swconfig.cfg cfg-headers/2092/sys.cfg cfg-headers/2092/trace.cfg cfg-headers/base/board.cfg cfg-headers/base/chipset.cfg cfg-headers/base/debug.cfg cfg-headers/base/dio.cfg cfg-headers/base/ffs.cfg cfg-headers/base/mdc.cfg cfg-headers/base/r2d.cfg cfg-headers/base/rf.cfg cfg-headers/base/rv.cfg cfg-headers/base/sys.cfg cfg-headers/base/trace.cfg cfg-headers/gprs/l1sw.cfg cfg-headers/gprs/swconfig.cfg cfg-headers/rv_swe-2091-pruned.h cfg-headers/rv_swe-2091.h cfg-headers/rv_swe-2092-pruned.h cfg-headers/rv_swe-2092.h configs/2092 configs/classic configs/l1reconst scripts/config-headers.sh
diffstat 77 files changed, 168 insertions(+), 466 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-headers/2091-pruned/board.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __BOARD_CFG__
-#define __BOARD_CFG__
-#define BOARD 41
-#define FLASH 35
-#endif /* __BOARD_CFG__ */ 
--- a/cfg-headers/2091-pruned/chipset.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __CHIPSET_CFG__
-#define __CHIPSET_CFG__
-#define ANLG_FAM 2
-#define ANLG_PG 0
-#define CHIPSET 10
-#endif /* __CHIPSET_CFG__ */ 
--- a/cfg-headers/2091-pruned/debug.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __DEBUG_CFG__
-#define __DEBUG_CFG__
-#define TI_NUC_MONITOR 0
-#define TI_PROFILER 0
-#endif /* __DEBUG_CFG__ */ 
--- a/cfg-headers/2091-pruned/dio.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#ifndef __DIO_CFG__
-#define __DIO_CFG__
-#define DIOIL_CONFIG 0
-#endif /* __DIO_CFG__ */ 
--- a/cfg-headers/2091-pruned/ffs.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __FFS_CFG__
-#define __FFS_CFG__
-#define TARGET 1
-#define _RVF 1
-#endif /* __FFS_CFG__ */ 
--- a/cfg-headers/2091-pruned/l1sw.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#ifndef __L1SW_CFG__
-#define __L1SW_CFG__
-#define AMR 1
-#define CUST 0
-#define DCO_ALGO 0
-#define IDS 1
-#define L1_12NEIGH 1
-#define L1_EOTD 0
-#define L1_EOTD_QBIT_ACC 0
-#define L1_GPRS 1
-#define L1_GTT 0
-#define L1_MIDI 0
-#define L1_VOICE_MEMO_AMR 1
-#define MELODY_E2 1
-#define OP_L1_STANDALONE 0
-#define OP_RIV_AUDIO 1
-#define ORDER2_TX_TEMP_CAL 1
-#define RAZ_VULSWITCH_REGAUDIO 0
-#define SECURITY 0
-#define SPEECH_RECO 1
-#define TESTMODE 1
-#define TRACE_TYPE 4
-#define VCXO_ALGO 1
-#endif /* __L1SW_CFG__ */ 
--- a/cfg-headers/2091-pruned/mdc.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __MDC_CFG__
-#define __MDC_CFG__
-#define DGP_PLAYER 1
-#define IMEL_PLAYER 1
-#define MIDI_PLAYER 1
-#endif /* __MDC_CFG__ */ 
--- a/cfg-headers/2091-pruned/r2d.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __R2D_CFG__
-#define __R2D_CFG__
-#define R2D_ASM 0
-#define R2D_LCD_TEST 0
-#endif /* __R2D_CFG__ */ 
--- a/cfg-headers/2091-pruned/rf.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __RF_CFG__
-#define __RF_CFG__
-#define RF 12
-#define RF_FAM 12
-#define RF_PA 2
-#define RF_PG 2
-#endif /* __RF_CFG__ */ 
--- a/cfg-headers/2091-pruned/rv.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __RV_CFG__
-#define __RV_CFG__
-#define RVTOOL 0
-#define TEST 0
-#define _GSM 1
-#endif /* __RV_CFG__ */ 
--- a/cfg-headers/2091-pruned/rv_swe.h	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#ifndef __RV_SWE_H__
-#define __RV_SWE_H__
-
-#define RVM_AUDIO_SWE
-#define RVM_ETM_SWE
-#define RVM_DAR_SWE
-#define RVM_SPI_SWE
-#define RVM_LLS_SWE
-#define RVM_KPD_SWE
-#define RVM_RTC_SWE
-#define RVM_FFS_SWE
-
-#endif /* __RV_SWE_H__ */
--- a/cfg-headers/2091-pruned/swconfig.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#ifndef __SWCONFIG_CFG__
-#define __SWCONFIG_CFG__
-#define ALR 1
-#define BT 0
-#define DP 0
-#define DWNLD 1
-#define GSMLITE 0
-#define L1_DYN_DSP_DWNLD 1
-#define LONG_JUMP 3
-#define MOVE_IN_INTERNAL_RAM 1
-#define OP_WCP 0
-#define PMODE 2
-#define RVDATA_INTERNALRAM 0
-#define SRVC 1
-#define TR_BAUD_CONFIG TR_BAUD_115200
-#define WCP_PROF 0
-#endif /* __SWCONFIG_CFG__ */ 
--- a/cfg-headers/2091-pruned/sys.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __SYS_CFG__
-#define __SYS_CFG__
-#define DSP 36
-#define STD 6
-#endif /* __SYS_CFG__ */ 
--- a/cfg-headers/2091-pruned/trace.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __TRACE_CFG__
-#define __TRACE_CFG__
-#define LAYER_DBG 0xFFFFFFFF
-#define TRACE_LEVEL_FILTER 5
-#endif /* __TRACE_CFG__ */ 
--- a/cfg-headers/2091/board.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __BOARD_CFG__
-#define __BOARD_CFG__
-#define BOARD 41
-#define FLASH 35
-#endif /* __BOARD_CFG__ */ 
--- a/cfg-headers/2091/chipset.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __CHIPSET_CFG__
-#define __CHIPSET_CFG__
-#define ANLG_FAM 2
-#define ANLG_PG 0
-#define CHIPSET 10
-#endif /* __CHIPSET_CFG__ */ 
--- a/cfg-headers/2091/debug.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __DEBUG_CFG__
-#define __DEBUG_CFG__
-#define TI_NUC_MONITOR 0
-#define TI_PROFILER 0
-#endif /* __DEBUG_CFG__ */ 
--- a/cfg-headers/2091/dio.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#ifndef __DIO_CFG__
-#define __DIO_CFG__
-#define DIOIL_CONFIG 0
-#endif /* __DIO_CFG__ */ 
--- a/cfg-headers/2091/ffs.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __FFS_CFG__
-#define __FFS_CFG__
-#define TARGET 1
-#define _RVF 1
-#endif /* __FFS_CFG__ */ 
--- a/cfg-headers/2091/l1sw.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#ifndef __L1SW_CFG__
-#define __L1SW_CFG__
-#define AMR 1
-#define CUST 0
-#define DCO_ALGO 0
-#define IDS 1
-#define L1_12NEIGH 1
-#define L1_EOTD 0
-#define L1_EOTD_QBIT_ACC 0
-#define L1_GPRS 1
-#define L1_GTT 0
-#define L1_MIDI 0
-#define L1_VOICE_MEMO_AMR 1
-#define MELODY_E2 1
-#define OP_L1_STANDALONE 0
-#define OP_RIV_AUDIO 1
-#define ORDER2_TX_TEMP_CAL 1
-#define RAZ_VULSWITCH_REGAUDIO 0
-#define SECURITY 0
-#define SPEECH_RECO 1
-#define TESTMODE 1
-#define TRACE_TYPE 4
-#define VCXO_ALGO 1
-#endif /* __L1SW_CFG__ */ 
--- a/cfg-headers/2091/mdc.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __MDC_CFG__
-#define __MDC_CFG__
-#define DGP_PLAYER 1
-#define IMEL_PLAYER 1
-#define MIDI_PLAYER 1
-#endif /* __MDC_CFG__ */ 
--- a/cfg-headers/2091/r2d.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __R2D_CFG__
-#define __R2D_CFG__
-#define R2D_ASM 0
-#define R2D_LCD_TEST 0
-#endif /* __R2D_CFG__ */ 
--- a/cfg-headers/2091/rf.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __RF_CFG__
-#define __RF_CFG__
-#define RF 12
-#define RF_FAM 12
-#define RF_PA 2
-#define RF_PG 2
-#endif /* __RF_CFG__ */ 
--- a/cfg-headers/2091/rv.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __RV_CFG__
-#define __RV_CFG__
-#define RVTOOL 0
-#define TEST 0
-#define _GSM 1
-#endif /* __RV_CFG__ */ 
--- a/cfg-headers/2091/rv_swe.h	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#ifndef __RV_SWE_H__
-#define __RV_SWE_H__
-
-#define RVM_ATP_SWE
-#define RVM_AUDIO_SWE
-#define RVM_ETM_SWE
-#define RVM_DAR_SWE
-#define RVM_SPI_SWE
-#define RVM_LLS_SWE
-#define RVM_KPD_SWE
-#define RVM_LCC_SWE
-#define RVM_MKS_SWE
-#define RVM_RTC_SWE
-#define RVM_FFS_SWE
-
-#endif /* __RV_SWE_H__ */
--- a/cfg-headers/2091/swconfig.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#ifndef __SWCONFIG_CFG__
-#define __SWCONFIG_CFG__
-#define ALR 1
-#define BT 0
-#define DP 0
-#define DWNLD 1
-#define GSMLITE 0
-#define L1_DYN_DSP_DWNLD 1
-#define LONG_JUMP 3
-#define MOVE_IN_INTERNAL_RAM 1
-#define OP_WCP 0
-#define PMODE 2
-#define RVDATA_INTERNALRAM 0
-#define SRVC 1
-#define TR_BAUD_CONFIG TR_BAUD_115200
-#define WCP_PROF 0
-#endif /* __SWCONFIG_CFG__ */ 
--- a/cfg-headers/2091/sys.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __SYS_CFG__
-#define __SYS_CFG__
-#define DSP 36
-#define STD 6
-#endif /* __SYS_CFG__ */ 
--- a/cfg-headers/2091/trace.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __TRACE_CFG__
-#define __TRACE_CFG__
-#define LAYER_DBG 0xFFFFFFFF
-#define TRACE_LEVEL_FILTER 5
-#endif /* __TRACE_CFG__ */ 
--- a/cfg-headers/2092-pruned/board.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __BOARD_CFG__
-#define __BOARD_CFG__
-#define BOARD 41
-#define FLASH 35
-#endif /* __BOARD_CFG__ */ 
--- a/cfg-headers/2092-pruned/chipset.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __CHIPSET_CFG__
-#define __CHIPSET_CFG__
-#define ANLG_FAM 2
-#define ANLG_PG 0
-#define CHIPSET 10
-#endif /* __CHIPSET_CFG__ */ 
--- a/cfg-headers/2092-pruned/debug.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __DEBUG_CFG__
-#define __DEBUG_CFG__
-#define TI_NUC_MONITOR 0
-#define TI_PROFILER 0
-#endif /* __DEBUG_CFG__ */ 
--- a/cfg-headers/2092-pruned/dio.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#ifndef __DIO_CFG__
-#define __DIO_CFG__
-#define DIOIL_CONFIG 0
-#endif /* __DIO_CFG__ */ 
--- a/cfg-headers/2092-pruned/ffs.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __FFS_CFG__
-#define __FFS_CFG__
-#define TARGET 1
-#define _RVF 1
-#endif /* __FFS_CFG__ */ 
--- a/cfg-headers/2092-pruned/l1sw.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#ifndef __L1SW_CFG__
-#define __L1SW_CFG__
-#define AMR 1
-#define CUST 0
-#define DCO_ALGO 0
-#define IDS 1
-#define L1_12NEIGH 1
-#define L1_EOTD 0
-#define L1_EOTD_QBIT_ACC 0
-#define L1_GPRS 1
-#define L1_GTT 0
-#define L1_MIDI 0
-#define L1_VOICE_MEMO_AMR 1
-#define MELODY_E2 1
-#define OP_L1_STANDALONE 0
-#define OP_RIV_AUDIO 1
-#define ORDER2_TX_TEMP_CAL 1
-#define RAZ_VULSWITCH_REGAUDIO 0
-#define SECURITY 0
-#define SPEECH_RECO 1
-#define TESTMODE 1
-#define TRACE_TYPE 4
-#define VCXO_ALGO 1
-#endif /* __L1SW_CFG__ */ 
--- a/cfg-headers/2092-pruned/mdc.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __MDC_CFG__
-#define __MDC_CFG__
-#define DGP_PLAYER 1
-#define IMEL_PLAYER 1
-#define MIDI_PLAYER 1
-#endif /* __MDC_CFG__ */ 
--- a/cfg-headers/2092-pruned/r2d.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __R2D_CFG__
-#define __R2D_CFG__
-#define R2D_ASM 0
-#define R2D_LCD_TEST 0
-#endif /* __R2D_CFG__ */ 
--- a/cfg-headers/2092-pruned/rf.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __RF_CFG__
-#define __RF_CFG__
-#define RF 12
-#define RF_FAM 12
-#define RF_PA 2
-#define RF_PG 2
-#endif /* __RF_CFG__ */ 
--- a/cfg-headers/2092-pruned/rv.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __RV_CFG__
-#define __RV_CFG__
-#define RVTOOL 0
-#define TEST 0
-#define _GSM 1
-#endif /* __RV_CFG__ */ 
--- a/cfg-headers/2092-pruned/rv_swe.h	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#ifndef __RV_SWE_H__
-#define __RV_SWE_H__
-
-#define RVM_AUDIO_SWE
-#define RVM_ETM_SWE
-#define RVM_DAR_SWE
-#define RVM_SPI_SWE
-#define RVM_LLS_SWE
-#define RVM_KPD_SWE
-#define RVM_R2D_SWE
-#define RVM_RTC_SWE
-#define RVM_FFS_SWE
-
-#endif /* __RV_SWE_H__ */
--- a/cfg-headers/2092-pruned/swconfig.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#ifndef __SWCONFIG_CFG__
-#define __SWCONFIG_CFG__
-#define ALR 1
-#define BT 0
-#define DP 0
-#define DWNLD 1
-#define GSMLITE 0
-#define L1_DYN_DSP_DWNLD 1
-#define LONG_JUMP 3
-#define MOVE_IN_INTERNAL_RAM 1
-#define OP_WCP 0
-#define PMODE 2
-#define RVDATA_INTERNALRAM 0
-#define SRVC 1
-#define TR_BAUD_CONFIG TR_BAUD_115200
-#define WCP_PROF 0
-#endif /* __SWCONFIG_CFG__ */ 
--- a/cfg-headers/2092-pruned/sys.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __SYS_CFG__
-#define __SYS_CFG__
-#define DSP 36
-#define STD 6
-#endif /* __SYS_CFG__ */ 
--- a/cfg-headers/2092-pruned/trace.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __TRACE_CFG__
-#define __TRACE_CFG__
-#define LAYER_DBG 0xFFFFFFFF
-#define TRACE_LEVEL_FILTER 5
-#endif /* __TRACE_CFG__ */ 
--- a/cfg-headers/2092/board.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __BOARD_CFG__
-#define __BOARD_CFG__
-#define BOARD 41
-#define FLASH 35
-#endif /* __BOARD_CFG__ */ 
--- a/cfg-headers/2092/chipset.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __CHIPSET_CFG__
-#define __CHIPSET_CFG__
-#define ANLG_FAM 2
-#define ANLG_PG 0
-#define CHIPSET 10
-#endif /* __CHIPSET_CFG__ */ 
--- a/cfg-headers/2092/debug.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __DEBUG_CFG__
-#define __DEBUG_CFG__
-#define TI_NUC_MONITOR 0
-#define TI_PROFILER 0
-#endif /* __DEBUG_CFG__ */ 
--- a/cfg-headers/2092/dio.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#ifndef __DIO_CFG__
-#define __DIO_CFG__
-#define DIOIL_CONFIG 0
-#endif /* __DIO_CFG__ */ 
--- a/cfg-headers/2092/ffs.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __FFS_CFG__
-#define __FFS_CFG__
-#define TARGET 1
-#define _RVF 1
-#endif /* __FFS_CFG__ */ 
--- a/cfg-headers/2092/l1sw.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#ifndef __L1SW_CFG__
-#define __L1SW_CFG__
-#define AMR 1
-#define CUST 0
-#define DCO_ALGO 0
-#define IDS 1
-#define L1_12NEIGH 1
-#define L1_EOTD 0
-#define L1_EOTD_QBIT_ACC 0
-#define L1_GPRS 1
-#define L1_GTT 0
-#define L1_MIDI 0
-#define L1_VOICE_MEMO_AMR 1
-#define MELODY_E2 1
-#define OP_L1_STANDALONE 0
-#define OP_RIV_AUDIO 1
-#define ORDER2_TX_TEMP_CAL 1
-#define RAZ_VULSWITCH_REGAUDIO 0
-#define SECURITY 0
-#define SPEECH_RECO 1
-#define TESTMODE 1
-#define TRACE_TYPE 4
-#define VCXO_ALGO 1
-#endif /* __L1SW_CFG__ */ 
--- a/cfg-headers/2092/mdc.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __MDC_CFG__
-#define __MDC_CFG__
-#define DGP_PLAYER 1
-#define IMEL_PLAYER 1
-#define MIDI_PLAYER 1
-#endif /* __MDC_CFG__ */ 
--- a/cfg-headers/2092/r2d.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __R2D_CFG__
-#define __R2D_CFG__
-#define R2D_ASM 0
-#define R2D_LCD_TEST 0
-#endif /* __R2D_CFG__ */ 
--- a/cfg-headers/2092/rf.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __RF_CFG__
-#define __RF_CFG__
-#define RF 12
-#define RF_FAM 12
-#define RF_PA 2
-#define RF_PG 2
-#endif /* __RF_CFG__ */ 
--- a/cfg-headers/2092/rv.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#ifndef __RV_CFG__
-#define __RV_CFG__
-#define RVTOOL 0
-#define TEST 0
-#define _GSM 1
-#endif /* __RV_CFG__ */ 
--- a/cfg-headers/2092/rv_swe.h	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#ifndef __RV_SWE_H__
-#define __RV_SWE_H__
-
-#define RVM_ATP_SWE
-#define RVM_AUDIO_SWE
-#define RVM_ETM_SWE
-#define RVM_DAR_SWE
-#define RVM_SPI_SWE
-#define RVM_LLS_SWE
-#define RVM_KPD_SWE
-#define RVM_LCC_SWE
-#define RVM_R2D_SWE
-#define RVM_MKS_SWE
-#define RVM_RTC_SWE
-#define RVM_FFS_SWE
-
-#endif /* __RV_SWE_H__ */
--- a/cfg-headers/2092/swconfig.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#ifndef __SWCONFIG_CFG__
-#define __SWCONFIG_CFG__
-#define ALR 1
-#define BT 0
-#define DP 0
-#define DWNLD 1
-#define GSMLITE 0
-#define L1_DYN_DSP_DWNLD 1
-#define LONG_JUMP 3
-#define MOVE_IN_INTERNAL_RAM 1
-#define OP_WCP 0
-#define PMODE 2
-#define RVDATA_INTERNALRAM 0
-#define SRVC 1
-#define TR_BAUD_CONFIG TR_BAUD_115200
-#define WCP_PROF 0
-#endif /* __SWCONFIG_CFG__ */ 
--- a/cfg-headers/2092/sys.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __SYS_CFG__
-#define __SYS_CFG__
-#define DSP 36
-#define STD 6
-#endif /* __SYS_CFG__ */ 
--- a/cfg-headers/2092/trace.cfg	Sun Oct 09 00:51:25 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#ifndef __TRACE_CFG__
-#define __TRACE_CFG__
-#define LAYER_DBG 0xFFFFFFFF
-#define TRACE_LEVEL_FILTER 5
-#endif /* __TRACE_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/board.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __BOARD_CFG__
+#define __BOARD_CFG__
+#define BOARD 41
+#define FLASH 35
+#endif /* __BOARD_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/chipset.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,6 @@
+#ifndef __CHIPSET_CFG__
+#define __CHIPSET_CFG__
+#define ANLG_FAM 2
+#define ANLG_PG 0
+#define CHIPSET 10
+#endif /* __CHIPSET_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/debug.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __DEBUG_CFG__
+#define __DEBUG_CFG__
+#define TI_NUC_MONITOR 0
+#define TI_PROFILER 0
+#endif /* __DEBUG_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/dio.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,4 @@
+#ifndef __DIO_CFG__
+#define __DIO_CFG__
+#define DIOIL_CONFIG 0
+#endif /* __DIO_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/ffs.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __FFS_CFG__
+#define __FFS_CFG__
+#define TARGET 1
+#define _RVF 1
+#endif /* __FFS_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/mdc.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,6 @@
+#ifndef __MDC_CFG__
+#define __MDC_CFG__
+#define DGP_PLAYER 1
+#define IMEL_PLAYER 1
+#define MIDI_PLAYER 1
+#endif /* __MDC_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/r2d.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __R2D_CFG__
+#define __R2D_CFG__
+#define R2D_ASM 0
+#define R2D_LCD_TEST 0
+#endif /* __R2D_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/rf.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,7 @@
+#ifndef __RF_CFG__
+#define __RF_CFG__
+#define RF 12
+#define RF_FAM 12
+#define RF_PA 2
+#define RF_PG 2
+#endif /* __RF_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/rv.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,6 @@
+#ifndef __RV_CFG__
+#define __RV_CFG__
+#define RVTOOL 0
+#define TEST 0
+#define _GSM 1
+#endif /* __RV_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/sys.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __SYS_CFG__
+#define __SYS_CFG__
+#define DSP 36
+#define STD 6
+#endif /* __SYS_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/base/trace.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,5 @@
+#ifndef __TRACE_CFG__
+#define __TRACE_CFG__
+#define LAYER_DBG 0xFFFFFFFF
+#define TRACE_LEVEL_FILTER 5
+#endif /* __TRACE_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/gprs/l1sw.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,24 @@
+#ifndef __L1SW_CFG__
+#define __L1SW_CFG__
+#define AMR 1
+#define CUST 0
+#define DCO_ALGO 0
+#define IDS 1
+#define L1_12NEIGH 1
+#define L1_EOTD 0
+#define L1_EOTD_QBIT_ACC 0
+#define L1_GPRS 1
+#define L1_GTT 0
+#define L1_MIDI 0
+#define L1_VOICE_MEMO_AMR 1
+#define MELODY_E2 1
+#define OP_L1_STANDALONE 0
+#define OP_RIV_AUDIO 1
+#define ORDER2_TX_TEMP_CAL 1
+#define RAZ_VULSWITCH_REGAUDIO 0
+#define SECURITY 0
+#define SPEECH_RECO 1
+#define TESTMODE 1
+#define TRACE_TYPE 4
+#define VCXO_ALGO 1
+#endif /* __L1SW_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/gprs/swconfig.cfg	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,17 @@
+#ifndef __SWCONFIG_CFG__
+#define __SWCONFIG_CFG__
+#define ALR 1
+#define BT 0
+#define DP 0
+#define DWNLD 1
+#define GSMLITE 0
+#define L1_DYN_DSP_DWNLD 1
+#define LONG_JUMP 3
+#define MOVE_IN_INTERNAL_RAM 1
+#define OP_WCP 0
+#define PMODE 2
+#define RVDATA_INTERNALRAM 0
+#define SRVC 1
+#define TR_BAUD_CONFIG TR_BAUD_115200
+#define WCP_PROF 0
+#endif /* __SWCONFIG_CFG__ */ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/rv_swe-2091-pruned.h	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,13 @@
+#ifndef __RV_SWE_H__
+#define __RV_SWE_H__
+
+#define RVM_AUDIO_SWE
+#define RVM_ETM_SWE
+#define RVM_DAR_SWE
+#define RVM_SPI_SWE
+#define RVM_LLS_SWE
+#define RVM_KPD_SWE
+#define RVM_RTC_SWE
+#define RVM_FFS_SWE
+
+#endif /* __RV_SWE_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/rv_swe-2091.h	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,16 @@
+#ifndef __RV_SWE_H__
+#define __RV_SWE_H__
+
+#define RVM_ATP_SWE
+#define RVM_AUDIO_SWE
+#define RVM_ETM_SWE
+#define RVM_DAR_SWE
+#define RVM_SPI_SWE
+#define RVM_LLS_SWE
+#define RVM_KPD_SWE
+#define RVM_LCC_SWE
+#define RVM_MKS_SWE
+#define RVM_RTC_SWE
+#define RVM_FFS_SWE
+
+#endif /* __RV_SWE_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/rv_swe-2092-pruned.h	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,14 @@
+#ifndef __RV_SWE_H__
+#define __RV_SWE_H__
+
+#define RVM_AUDIO_SWE
+#define RVM_ETM_SWE
+#define RVM_DAR_SWE
+#define RVM_SPI_SWE
+#define RVM_LLS_SWE
+#define RVM_KPD_SWE
+#define RVM_R2D_SWE
+#define RVM_RTC_SWE
+#define RVM_FFS_SWE
+
+#endif /* __RV_SWE_H__ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cfg-headers/rv_swe-2092.h	Sun Oct 09 05:53:14 2016 +0000
@@ -0,0 +1,17 @@
+#ifndef __RV_SWE_H__
+#define __RV_SWE_H__
+
+#define RVM_ATP_SWE
+#define RVM_AUDIO_SWE
+#define RVM_ETM_SWE
+#define RVM_DAR_SWE
+#define RVM_SPI_SWE
+#define RVM_LLS_SWE
+#define RVM_KPD_SWE
+#define RVM_LCC_SWE
+#define RVM_R2D_SWE
+#define RVM_MKS_SWE
+#define RVM_RTC_SWE
+#define RVM_FFS_SWE
+
+#endif /* __RV_SWE_H__ */
--- a/configs/2092	Sun Oct 09 00:51:25 2016 +0000
+++ b/configs/2092	Sun Oct 09 05:53:14 2016 +0000
@@ -4,7 +4,7 @@
 # targets that are designed to work with "low cost" chargers - and none
 # of our targets are in that category.
 
-scripts/config-headers.sh 2092-pruned
+scripts/config-headers.sh gprs 2092-pruned
 
 CONDAT=condat2
 GPF=gpf2
--- a/configs/classic	Sun Oct 09 00:51:25 2016 +0000
+++ b/configs/classic	Sun Oct 09 05:53:14 2016 +0000
@@ -1,7 +1,7 @@
 # This configuration reproduces the original TCS211 pdt_2091 build,
 # using almost all of the original blobs from Sotovik.
 
-scripts/config-headers.sh 2091
+scripts/config-headers.sh gprs 2091
 
 CONDAT=condat2
 GPF=gpf2
--- a/configs/l1reconst	Sun Oct 09 00:51:25 2016 +0000
+++ b/configs/l1reconst	Sun Oct 09 05:53:14 2016 +0000
@@ -5,7 +5,7 @@
 # to work with "low cost" chargers - and none of our targets are in
 # that category.
 
-scripts/config-headers.sh 2091-pruned
+scripts/config-headers.sh gprs 2091-pruned
 
 CONDAT=condat2
 GPF=gpf2
--- a/scripts/config-headers.sh	Sun Oct 09 00:51:25 2016 +0000
+++ b/scripts/config-headers.sh	Sun Oct 09 05:53:14 2016 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-if [ $# != 1 ]
+if [ $# != 2 ]
 then
-	echo "usage: $0 config-flavor" 1>&2
+	echo "usage: $0 srvc-flavor rv-swe-flavor" 1>&2
 	exit 1
 fi
 
@@ -21,5 +21,7 @@
 set -e
 
 rm -rf $BUILD_DIR/config
-cp -r cfg-headers/$1 $BUILD_DIR/config
+cp -r cfg-headers/base $BUILD_DIR/config
+cp cfg-headers/$1/* $BUILD_DIR/config
+cp cfg-headers/rv_swe-$2.h $BUILD_DIR/config/rv_swe.h
 cp targets/$TARGET.h $BUILD_DIR/config/fc-target.cfg