# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1531718385 0
# Node ID b6c8dd9a1b0243448358906ac99511db6b2f7997
# Parent  ab57d3585e186ed2207ab3d2febe149aef89f484
components: switch to new Nucleus

diff -r ab57d3585e18 -r b6c8dd9a1b02 components/abb
--- a/components/abb	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/abb	Mon Jul 16 05:19:45 2018 +0000
@@ -12,7 +12,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/audio
--- a/components/audio	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/audio	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/audio_bgd
--- a/components/audio_bgd	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/audio_bgd	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/bootloader
--- a/components/bootloader	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/bootloader	Mon Jul 16 05:19:45 2018 +0000
@@ -41,7 +41,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/buzzer
--- a/components/buzzer	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/buzzer	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/config_gprs_fl
--- a/components/config_gprs_fl	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/config_gprs_fl	Mon Jul 16 05:19:45 2018 +0000
@@ -64,7 +64,7 @@
 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/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/config_gprs_ir
--- a/components/config_gprs_ir	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/config_gprs_ir	Mon Jul 16 05:19:45 2018 +0000
@@ -64,7 +64,7 @@
 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/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/config_gsm_fl
--- a/components/config_gsm_fl	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/config_gsm_fl	Mon Jul 16 05:19:45 2018 +0000
@@ -66,7 +66,7 @@
 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/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/config_gsm_ir
--- a/components/config_gsm_ir	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/config_gsm_ir	Mon Jul 16 05:19:45 2018 +0000
@@ -66,7 +66,7 @@
 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/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/cst
--- a/components/cst	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/cst	Mon Jul 16 05:19:45 2018 +0000
@@ -25,7 +25,7 @@
 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$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/dar
--- a/components/dar	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/dar	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/dar_gbl_var
--- a/components/dar_gbl_var	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/dar_gbl_var	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/drivers_flash
--- a/components/drivers_flash	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/drivers_flash	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/etm
--- a/components/etm	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/etm	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/fchg
--- a/components/fchg	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/fchg	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/ffs
--- a/components/ffs	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/ffs	Mon Jul 16 05:19:45 2018 +0000
@@ -13,7 +13,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/ffs_drv
--- a/components/ffs_drv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/ffs_drv	Mon Jul 16 05:19:45 2018 +0000
@@ -13,7 +13,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
@@ -65,7 +65,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/ffs_pcm
--- a/components/ffs_pcm	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/ffs_pcm	Mon Jul 16 05:19:45 2018 +0000
@@ -12,7 +12,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/frame_na7_db_fl
--- a/components/frame_na7_db_fl	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/frame_na7_db_fl	Mon Jul 16 05:19:45 2018 +0000
@@ -11,7 +11,7 @@
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/frame_na7_db_ir
--- a/components/frame_na7_db_ir	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/frame_na7_db_ir	Mon Jul 16 05:19:45 2018 +0000
@@ -11,7 +11,7 @@
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/tst"
 
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/kpd
--- a/components/kpd	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/kpd	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/l1_custom_ext
--- a/components/l1_custom_ext	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/l1_custom_ext	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/l1_custom_int
--- a/components/l1_custom_int	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/l1_custom_int	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/l1_ext
--- a/components/l1_ext	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/l1_ext	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/l1_int
--- a/components/l1_int	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/l1_int	Mon Jul 16 05:19:45 2018 +0000
@@ -39,7 +39,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame/cust_os"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/lls
--- a/components/lls	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/lls	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/main
--- a/components/main	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/main	Mon Jul 16 05:19:45 2018 +0000
@@ -12,7 +12,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/misc_na7_db_fl
--- a/components/misc_na7_db_fl	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/misc_na7_db_fl	Mon Jul 16 05:19:45 2018 +0000
@@ -10,7 +10,7 @@
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/misc_na7_db_ir
--- a/components/misc_na7_db_ir	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/misc_na7_db_ir	Mon Jul 16 05:19:45 2018 +0000
@@ -10,7 +10,7 @@
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/misc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/power
--- a/components/power	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/power	Mon Jul 16 05:19:45 2018 +0000
@@ -13,7 +13,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/riviera_core_flash
--- a/components/riviera_core_flash	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/riviera_core_flash	Mon Jul 16 05:19:45 2018 +0000
@@ -5,7 +5,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/riviera_cust_flash
--- a/components/riviera_cust_flash	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/riviera_cust_flash	Mon Jul 16 05:19:45 2018 +0000
@@ -18,7 +18,7 @@
 
 # Includes
 
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/rtc_drv
--- a/components/rtc_drv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/rtc_drv	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/sim_drv
--- a/components/sim_drv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/sim_drv	Mon Jul 16 05:19:45 2018 +0000
@@ -10,7 +10,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
@@ -54,7 +54,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/spi_drv
--- a/components/spi_drv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/spi_drv	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/tif_na7_db_fl
--- a/components/tif_na7_db_fl	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/tif_na7_db_fl	Mon Jul 16 05:19:45 2018 +0000
@@ -10,7 +10,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/tif_na7_db_ir
--- a/components/tif_na7_db_ir	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/tif_na7_db_ir	Mon Jul 16 05:19:45 2018 +0000
@@ -10,7 +10,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/frame"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/ccd"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/tpudrv
--- a/components/tpudrv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/tpudrv	Mon Jul 16 05:19:45 2018 +0000
@@ -6,7 +6,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I../config"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rvt"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/uart_b_lib
--- a/components/uart_b_lib	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/uart_b_lib	Mon Jul 16 05:19:45 2018 +0000
@@ -64,7 +64,7 @@
 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/old"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/cust0"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r ab57d3585e18 -r b6c8dd9a1b02 components/uart_drv
--- a/components/uart_drv	Mon Jul 16 04:20:50 2018 +0000
+++ b/components/uart_drv	Mon Jul 16 05:19:45 2018 +0000
@@ -11,7 +11,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
-CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"