# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1602869196 0
# Node ID 598958aec071b175efb16d57cd581d9637ac5293
# Parent  ef6d1ca160b292fd4513a0657fedc1398e42258b
components: switch to new Nucleus

diff -r ef6d1ca160b2 -r 598958aec071 components/abb
--- a/components/abb	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/abb	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/audio
--- a/components/audio	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/audio	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/audio_bgd
--- a/components/audio_bgd	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/audio_bgd	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/bootloader
--- a/components/bootloader	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/bootloader	Fri Oct 16 17:26:36 2020 +0000
@@ -48,7 +48,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 ef6d1ca160b2 -r 598958aec071 components/buzzer
--- a/components/buzzer	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/buzzer	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/config_gprs_fl
--- a/components/config_gprs_fl	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/config_gprs_fl	Fri Oct 16 17:26:36 2020 +0000
@@ -65,7 +65,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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ef6d1ca160b2 -r 598958aec071 components/config_gprs_ir
--- a/components/config_gprs_ir	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/config_gprs_ir	Fri Oct 16 17:26:36 2020 +0000
@@ -65,7 +65,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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/frame/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ef6d1ca160b2 -r 598958aec071 components/config_gsm_fl
--- a/components/config_gsm_fl	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/config_gsm_fl	Fri Oct 16 17:26:36 2020 +0000
@@ -67,7 +67,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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ef6d1ca160b2 -r 598958aec071 components/config_gsm_ir
--- a/components/config_gsm_ir	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/config_gsm_ir	Fri Oct 16 17:26:36 2020 +0000
@@ -67,7 +67,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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/condat/com/src/config"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r ef6d1ca160b2 -r 598958aec071 components/cst
--- a/components/cst	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/cst	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/dar
--- a/components/dar	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/dar	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/dar_gbl_var
--- a/components/dar_gbl_var	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/dar_gbl_var	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/drivers_flash
--- a/components/drivers_flash	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/drivers_flash	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/etm
--- a/components/etm	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/etm	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/fchg
--- a/components/fchg	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/fchg	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/ffs
--- a/components/ffs	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/ffs	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/ffs_drv
--- a/components/ffs_drv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/ffs_drv	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/ffs_pcm
--- a/components/ffs_pcm	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/ffs_pcm	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/kpd
--- a/components/kpd	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/kpd	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/l1_custom_ext
--- a/components/l1_custom_ext	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/l1_custom_ext	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/l1_custom_int
--- a/components/l1_custom_int	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/l1_custom_int	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/l1_ext
--- a/components/l1_ext	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/l1_ext	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/l1_int
--- a/components/l1_int	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/l1_int	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/lls
--- a/components/lls	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/lls	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/main
--- a/components/main	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/main	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/misc_fl
--- a/components/misc_fl	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/misc_fl	Fri Oct 16 17:26:36 2020 +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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
diff -r ef6d1ca160b2 -r 598958aec071 components/misc_ir
--- a/components/misc_ir	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/misc_ir	Fri Oct 16 17:26:36 2020 +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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc"
 
 # Source modules
diff -r ef6d1ca160b2 -r 598958aec071 components/power
--- a/components/power	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/power	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/r2d_drv_custom_flash
--- a/components/r2d_drv_custom_flash	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/r2d_drv_custom_flash	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/r2d_drv_flash
--- a/components/r2d_drv_flash	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/r2d_drv_flash	Fri Oct 16 17:26:36 2020 +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"
@@ -58,7 +58,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"
@@ -98,7 +98,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 ef6d1ca160b2 -r 598958aec071 components/r2d_drv_int_ram
--- a/components/r2d_drv_int_ram	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/r2d_drv_int_ram	Fri Oct 16 17:26:36 2020 +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"
@@ -47,7 +47,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 ef6d1ca160b2 -r 598958aec071 components/riviera_core_flash
--- a/components/riviera_core_flash	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/riviera_core_flash	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/riviera_cust_flash
--- a/components/riviera_cust_flash	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/riviera_cust_flash	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/rtc_drv
--- a/components/rtc_drv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/rtc_drv	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/sim_drv
--- a/components/sim_drv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/sim_drv	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/spi_drv
--- a/components/spi_drv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/spi_drv	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/tif_fl
--- a/components/tif_fl	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/tif_fl	Fri Oct 16 17:26:36 2020 +0000
@@ -15,7 +15,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+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 ef6d1ca160b2 -r 598958aec071 components/tif_ir
--- a/components/tif_ir	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/tif_ir	Fri Oct 16 17:26:36 2020 +0000
@@ -15,7 +15,7 @@
 # Includes
 
 CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc"
-CPPFLAGS="$CPPFLAGS -I$SRC/gpf/inc/nuc/arm7"
+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 ef6d1ca160b2 -r 598958aec071 components/tpudrv
--- a/components/tpudrv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/tpudrv	Fri Oct 16 17:26:36 2020 +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 ef6d1ca160b2 -r 598958aec071 components/uart_b_lib
--- a/components/uart_b_lib	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/uart_b_lib	Fri Oct 16 17:26:36 2020 +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/arm7"
+CPPFLAGS="$CPPFLAGS -I$SRC/nucleus"
 CPPFLAGS="$CPPFLAGS -I$SRCDIR"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/cust0"
 CPPFLAGS="$CPPFLAGS -I.."
diff -r ef6d1ca160b2 -r 598958aec071 components/uart_drv
--- a/components/uart_drv	Fri Oct 16 17:13:35 2020 +0000
+++ b/components/uart_drv	Fri Oct 16 17:26:36 2020 +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"
diff -r ef6d1ca160b2 -r 598958aec071 scripts/convert-nucleus.ex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/convert-nucleus.ex	Fri Oct 16 17:26:36 2020 +0000
@@ -0,0 +1,4 @@
+1,$s/cs\/os\/nucleus/nucleus/
+1,$s/gpf\/inc\/nuc\/arm7/nucleus/
+
+w