# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1602867793 0
# Node ID fdc83c1ab3fff1c12e71eb60e953c7b28e72f7bd
# Parent  7ded024bf471bfc296a8c3eb9c5343794ee6c512
components: first automated conversion pass

diff -r 7ded024bf471 -r fdc83c1ab3ff components/abb
--- a/components/abb	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/abb	Fri Oct 16 17:03:13 2020 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/aci
--- a/components/aci	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/aci	Fri Oct 16 17:03:13 2020 +0000
@@ -88,14 +88,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 if [ "$MMI" = 2 ]
 then
-	CPPFLAGS="$CPPFLAGS -I$SRC/ui3/mfw"
+	CPPFLAGS="$CPPFLAGS -I$SRC/ui/mfw"
 fi
 
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
@@ -103,7 +103,7 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_ext"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -482,13 +482,13 @@
 
 # New includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # KSD source modules
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/aci_dti_mng
--- a/components/aci_dti_mng	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/aci_dti_mng	Fri Oct 16 17:03:13 2020 +0000
@@ -56,13 +56,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # Source modules
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/aciext
--- a/components/aciext	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/aciext	Fri Oct 16 17:03:13 2020 +0000
@@ -69,14 +69,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_ext"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/alr
--- a/components/alr	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/alr	Fri Oct 16 17:03:13 2020 +0000
@@ -65,10 +65,10 @@
 
 SRCDIR=$SRC/aci2/alr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/atiext
--- a/components/atiext	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/atiext	Fri Oct 16 17:03:13 2020 +0000
@@ -62,13 +62,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ati_ext"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 
 # Source modules
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/audio
--- a/components/audio	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/audio	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/audio_bgd
--- a/components/audio_bgd	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/audio_bgd	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/bmi
--- a/components/bmi	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/bmi	Fri Oct 16 17:03:13 2020 +0000
@@ -84,16 +84,16 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/bmi"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/atb"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/bmi"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/mfw"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/atb"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -119,7 +119,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/ui3/bmi
+SRCDIR=$SRC/ui/bmi
 
 cfile_str2ind $SRCDIR/mmiCall.c
 cfile_str2ind $SRCDIR/mmiResources.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/bootloader
--- a/components/bootloader	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/bootloader	Fri Oct 16 17:03:13 2020 +0000
@@ -51,8 +51,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/buzzer
--- a/components/buzzer	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/buzzer	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/cc
--- a/components/cc	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/cc	Fri Oct 16 17:03:13 2020 +0000
@@ -39,10 +39,10 @@
 
 SRCDIR=$SRC/g23m-gsm/cc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ccd
--- a/components/ccd	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ccd	Fri Oct 16 17:03:13 2020 +0000
@@ -10,13 +10,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/ccd
+SRCDIR=$SRC/gpf/ccd
 
 cfile_plain $SRCDIR/ccd.c
 cfile_plain $SRCDIR/bitfun.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ccddata
--- a/components/ccddata	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ccddata	Fri Oct 16 17:03:13 2020 +0000
@@ -5,13 +5,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 
 # Source modules
 
-SRCDIR=$SRC/gpf3/ccd
+SRCDIR=$SRC/gpf/ccd
 
 cfile_plain $SRCDIR/ccd_config.c
 cfile_plain $SRCDIR/ccddata_mconst.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/cci
--- a/components/cci	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/cci	Fri Oct 16 17:03:13 2020 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r 7ded024bf471 -r fdc83c1ab3ff components/cci_ir
--- a/components/cci_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/cci_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r 7ded024bf471 -r fdc83c1ab3ff components/cl
--- a/components/cl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/cl	Fri Oct 16 17:03:13 2020 +0000
@@ -53,11 +53,11 @@
 
 SRCDIR=$SRC/g23m-gprs/cl
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/comlib
--- a/components/comlib	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/comlib	Fri Oct 16 17:03:13 2020 +0000
@@ -22,11 +22,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -52,7 +52,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/com/src/comlib
+SRCDIR=$SRC/condat/com/src/comlib
 
 if [ "$SRVC" != 0 ]
 then
diff -r 7ded024bf471 -r fdc83c1ab3ff components/config_gprs_fl
--- a/components/config_gprs_fl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/config_gprs_fl	Fri Oct 16 17:03:13 2020 +0000
@@ -60,13 +60,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/frame/config"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -92,7 +92,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/frame/config
+SRCDIR=$SRC/condat/frame/config
 
 cfile_str2ind $SRCDIR/gprscomp.c
 cfile_str2ind $SRCDIR/custcomp.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/config_gprs_ir
--- a/components/config_gprs_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/config_gprs_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -60,13 +60,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/frame/config"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -92,6 +92,6 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/frame/config
+SRCDIR=$SRC/condat/frame/config
 
 cfile_str2ind $SRCDIR/gprscomp.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/config_gsm_fl
--- a/components/config_gsm_fl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/config_gsm_fl	Fri Oct 16 17:03:13 2020 +0000
@@ -62,13 +62,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/config"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -94,7 +94,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/com/src/config
+SRCDIR=$SRC/condat/com/src/config
 
 cfile_str2ind $SRCDIR/gsmcomp.c
 cfile_str2ind $SRCDIR/custcomp.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/config_gsm_ir
--- a/components/config_gsm_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/config_gsm_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -62,13 +62,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/config"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -94,6 +94,6 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/com/src/config
+SRCDIR=$SRC/condat/com/src/config
 
 cfile_str2ind $SRCDIR/gsmcomp.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/cst
--- a/components/cst	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/cst	Fri Oct 16 17:03:13 2020 +0000
@@ -22,14 +22,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/dar
--- a/components/dar	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/dar	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/dar_gbl_var
--- a/components/dar_gbl_var	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/dar_gbl_var	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/dl
--- a/components/dl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/dl	Fri Oct 16 17:03:13 2020 +0000
@@ -48,10 +48,10 @@
 
 SRCDIR=$SRC/g23m-gsm/dl
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/drivers_flash
--- a/components/drivers_flash	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/drivers_flash	Fri Oct 16 17:03:13 2020 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/dti
--- a/components/dti	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/dti	Fri Oct 16 17:03:13 2020 +0000
@@ -49,12 +49,12 @@
 
 SRCDIR=$SRC/g23m-aci/dti
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/etm
--- a/components/etm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/etm	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/fad
--- a/components/fad	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/fad	Fri Oct 16 17:03:13 2020 +0000
@@ -54,10 +54,10 @@
 
 SRCDIR=$SRC/g23m-fad/fad
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/fchg
--- a/components/fchg	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/fchg	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ffs
--- a/components/ffs	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ffs	Fri Oct 16 17:03:13 2020 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ffs_drv
--- a/components/ffs_drv	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ffs_drv	Fri Oct 16 17:03:13 2020 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -68,8 +68,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ffs_pcm
--- a/components/ffs_pcm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ffs_pcm	Fri Oct 16 17:03:13 2020 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/gdi
--- a/components/gdi	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/gdi	Fri Oct 16 17:03:13 2020 +0000
@@ -75,13 +75,13 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/src/driver"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/driver"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -107,7 +107,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/condat2/com/src/driver
+SRCDIR=$SRC/condat/com/src/driver
 
 cfile_str2ind $SRCDIR/audio.c
 cfile_str2ind $SRCDIR/display.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/gmm
--- a/components/gmm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/gmm	Fri Oct 16 17:03:13 2020 +0000
@@ -53,12 +53,12 @@
 
 SRCDIR=$SRC/g23m-gprs/gmm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/grlc
--- a/components/grlc	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/grlc	Fri Oct 16 17:03:13 2020 +0000
@@ -54,12 +54,12 @@
 
 SRCDIR=$SRC/g23m-gprs/grlc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/grlc_ir
--- a/components/grlc_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/grlc_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -55,12 +55,12 @@
 
 SRCDIR=$SRC/g23m-gprs/grlc
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/grr
--- a/components/grr	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/grr	Fri Oct 16 17:03:13 2020 +0000
@@ -54,12 +54,12 @@
 
 SRCDIR=$SRC/g23m-gprs/grr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/icn
--- a/components/icn	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/icn	Fri Oct 16 17:03:13 2020 +0000
@@ -80,14 +80,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/bmi"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/bmi"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/mfw"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -113,7 +113,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/ui3/bmi/Icons
+SRCDIR=$SRC/ui/bmi/Icons
 
 cfile_str2ind $SRCDIR/IcnAniPhone.c
 cfile_str2ind $SRCDIR/IcnBattery.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/kpd
--- a/components/kpd	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/kpd	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l1_custom_ext
--- a/components/l1_custom_ext	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l1_custom_ext	Fri Oct 16 17:03:13 2020 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l1_custom_int
--- a/components/l1_custom_int	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l1_custom_int	Fri Oct 16 17:03:13 2020 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l1_ext
--- a/components/l1_ext	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l1_ext	Fri Oct 16 17:03:13 2020 +0000
@@ -8,7 +8,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l1_int
--- a/components/l1_int	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l1_int	Fri Oct 16 17:03:13 2020 +0000
@@ -41,7 +41,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app/buzzer"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l1_pei
--- a/components/l1_pei	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l1_pei	Fri Oct 16 17:03:13 2020 +0000
@@ -39,12 +39,12 @@
 
 SRCDIR=$SRC/g23m-gsm/l1
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 
 # Source modules
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/l2r
--- a/components/l2r	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/l2r	Fri Oct 16 17:03:13 2020 +0000
@@ -50,10 +50,10 @@
 
 SRCDIR=$SRC/g23m-fad/l2r
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/llc
--- a/components/llc	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/llc	Fri Oct 16 17:03:13 2020 +0000
@@ -53,10 +53,10 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/cci"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/llc"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r 7ded024bf471 -r fdc83c1ab3ff components/lls
--- a/components/lls	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/lls	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/main
--- a/components/main	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/main	Fri Oct 16 17:03:13 2020 +0000
@@ -15,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/mfw
--- a/components/mfw	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/mfw	Fri Oct 16 17:03:13 2020 +0000
@@ -84,16 +84,16 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/atb"
-CPPFLAGS="$CPPFLAGS -I$SRC/ui3/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_ext"
-CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/atb"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui/mfw"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_ext"
+CPPFLAGS="$CPPFLAGS -I$SRC/g23m-aci/aci_dti_mng"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
@@ -119,7 +119,7 @@
 
 # MFW source modules
 
-SRCDIR=$SRC/ui3/mfw
+SRCDIR=$SRC/ui/mfw
 
 cfile_str2ind $SRCDIR/ti1_key.c
 cfile_str2ind $SRCDIR/ti1_tmr.c
@@ -161,7 +161,7 @@
 
 # ATB source modules
 
-SRCDIR=$SRC/ui3/atb
+SRCDIR=$SRC/ui/atb
 
 cfile_str2ind $SRCDIR/ATBCommon.c
 cfile_str2ind $SRCDIR/ATBDisplay.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/misc_fl
--- a/components/misc_fl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/misc_fl	Fri Oct 16 17:03:13 2020 +0000
@@ -8,14 +8,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/misc
+SRCDIR=$SRC/gpf/misc
 
 cfile_plain $SRCDIR/printtofile.c
 cfile_plain $SRCDIR/tok.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/misc_ir
--- a/components/misc_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/misc_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -8,14 +8,14 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/misc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/misc
+SRCDIR=$SRC/gpf/misc
 
 cfile_plain $SRCDIR/printtofile.c
 cfile_plain $SRCDIR/tok.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/mm
--- a/components/mm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/mm	Fri Oct 16 17:03:13 2020 +0000
@@ -62,10 +62,10 @@
 
 SRCDIR=$SRC/g23m-gsm/mm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/osx
--- a/components/osx	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/osx	Fri Oct 16 17:03:13 2020 +0000
@@ -8,12 +8,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/frame/cust_os
+SRCDIR=$SRC/gpf/frame/cust_os
 
 cfile_plain $SRCDIR/osx.c
diff -r 7ded024bf471 -r fdc83c1ab3ff components/power
--- a/components/power	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/power	Fri Oct 16 17:03:13 2020 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ppp
--- a/components/ppp	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ppp	Fri Oct 16 17:03:13 2020 +0000
@@ -51,12 +51,12 @@
 
 SRCDIR=$SRC/g23m-fad/ppp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ppp_ir
--- a/components/ppp_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ppp_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -51,12 +51,12 @@
 
 SRCDIR=$SRC/g23m-fad/ppp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/r2d_drv_custom_flash
--- a/components/r2d_drv_custom_flash	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/r2d_drv_custom_flash	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/r2d_drv_flash
--- a/components/r2d_drv_flash	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/r2d_drv_flash	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -61,8 +61,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -101,8 +101,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/r2d_drv_int_ram
--- a/components/r2d_drv_int_ram	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/r2d_drv_int_ram	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -50,8 +50,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ra
--- a/components/ra	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ra	Fri Oct 16 17:03:13 2020 +0000
@@ -49,10 +49,10 @@
 
 SRCDIR=$SRC/g23m-fad/ra
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/riviera_core_flash
--- a/components/riviera_core_flash	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/riviera_core_flash	Fri Oct 16 17:03:13 2020 +0000
@@ -8,8 +8,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/riviera_cust_flash
--- a/components/riviera_cust_flash	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/riviera_cust_flash	Fri Oct 16 17:03:13 2020 +0000
@@ -21,8 +21,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/rlp
--- a/components/rlp	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/rlp	Fri Oct 16 17:03:13 2020 +0000
@@ -59,10 +59,10 @@
 
 SRCDIR=$SRC/g23m-fad/rlp
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/rr
--- a/components/rr	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/rr	Fri Oct 16 17:03:13 2020 +0000
@@ -62,11 +62,11 @@
 
 SRCDIR=$SRC/g23m-gsm/rr
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/rtc_drv
--- a/components/rtc_drv	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/rtc_drv	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/sim_b_lib
--- a/components/sim_b_lib	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/sim_b_lib	Fri Oct 16 17:03:13 2020 +0000
@@ -70,10 +70,10 @@
 
 SRCDIR=$SRC/g23m-gsm/sim
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/sim_drv
--- a/components/sim_drv	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/sim_drv	Fri Oct 16 17:03:13 2020 +0000
@@ -13,8 +13,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
@@ -57,8 +57,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/sm
--- a/components/sm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/sm	Fri Oct 16 17:03:13 2020 +0000
@@ -54,11 +54,11 @@
 
 SRCDIR=$SRC/g23m-gprs/sm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/sms
--- a/components/sms	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/sms	Fri Oct 16 17:03:13 2020 +0000
@@ -49,10 +49,10 @@
 
 SRCDIR=$SRC/g23m-gsm/sms
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/sndcp
--- a/components/sndcp	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/sndcp	Fri Oct 16 17:03:13 2020 +0000
@@ -54,11 +54,11 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/dti"
 CPPFLAGS="$CPPFLAGS -I$SRC/g23m-gprs/sndcp"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r 7ded024bf471 -r fdc83c1ab3ff components/spi_drv
--- a/components/spi_drv	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/spi_drv	Fri Oct 16 17:03:13 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/ss
--- a/components/ss	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/ss	Fri Oct 16 17:03:13 2020 +0000
@@ -48,10 +48,10 @@
 
 SRCDIR=$SRC/g23m-gsm/ss
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/t30
--- a/components/t30	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/t30	Fri Oct 16 17:03:13 2020 +0000
@@ -55,10 +55,10 @@
 
 SRCDIR=$SRC/g23m-fad/t30
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/tif_fl
--- a/components/tif_fl	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/tif_fl	Fri Oct 16 17:03:13 2020 +0000
@@ -14,12 +14,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rvt"
@@ -33,7 +33,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/tst
+SRCDIR=$SRC/gpf/tst
 
 ln -sf $SRCDIR/drv $BUILD_DIR/$LIBNAME
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/tif_ir
--- a/components/tif_ir	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/tif_ir	Fri Oct 16 17:03:13 2020 +0000
@@ -14,12 +14,12 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/ccd"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf2/tst"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rvt"
@@ -33,7 +33,7 @@
 
 # Source modules
 
-SRCDIR=$SRC/gpf2/tst
+SRCDIR=$SRC/gpf/tst
 
 ln -sf $SRCDIR/drv $BUILD_DIR/$LIBNAME
 
diff -r 7ded024bf471 -r fdc83c1ab3ff components/uart_b_lib
--- a/components/uart_b_lib	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/uart_b_lib	Fri Oct 16 17:03:13 2020 +0000
@@ -60,11 +60,11 @@
 
 SRCDIR=$SRC/g23m-aci/uart
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc/nuc/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/cust0"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r 7ded024bf471 -r fdc83c1ab3ff components/uart_drv
--- a/components/uart_drv	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/uart_drv	Fri Oct 16 17:03:13 2020 +0000
@@ -14,8 +14,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
diff -r 7ded024bf471 -r fdc83c1ab3ff components/upm
--- a/components/upm	Fri Oct 16 16:29:07 2020 +0000
+++ b/components/upm	Fri Oct 16 17:03:13 2020 +0000
@@ -55,11 +55,11 @@
 
 SRCDIR=$SRC/g23m-gprs/upm
 
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
-CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
-CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/include"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/cdginc"
+CPPFLAGS="$CPPFLAGS -I../../cdg-hybrid/sap-inline"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r 7ded024bf471 -r fdc83c1ab3ff scripts/convert-from-magnetite.ex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/convert-from-magnetite.ex	Fri Oct 16 17:03:13 2020 +0000
@@ -0,0 +1,12 @@
+1,$s/$CONDAT/condat/
+1,$s/$GPF/gpf/
+1,$s/$CDGINC/cdg-hybrid\/cdginc/
+1,$s/$CDGPRIM/cdg-hybrid\/sap-inline/
+1,$s/$ACI/g23m-aci/
+
+1,$s/condat2/condat/
+1,$s/gpf2/gpf/
+1,$s/gpf3/gpf/
+1,$s/ui3/ui/
+
+w