FreeCalypso > hg > fc-tourmaline

changeset 26:598958aec071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components: switch to new Nucleus
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 16 Oct 2020 17:26:36 +0000
parents ef6d1ca160b2
children 1803a0bc5808
files components/abb components/audio components/audio_bgd components/bootloader components/buzzer components/config_gprs_fl components/config_gprs_ir components/config_gsm_fl components/config_gsm_ir components/cst components/dar components/dar_gbl_var components/drivers_flash components/etm components/fchg components/ffs components/ffs_drv components/ffs_pcm components/kpd components/l1_custom_ext components/l1_custom_int components/l1_ext components/l1_int components/lls components/main components/misc_fl components/misc_ir components/power components/r2d_drv_custom_flash components/r2d_drv_flash components/r2d_drv_int_ram components/riviera_core_flash components/riviera_cust_flash components/rtc_drv components/sim_drv components/spi_drv components/tif_fl components/tif_ir components/tpudrv components/uart_b_lib components/uart_drv scripts/convert-nucleus.ex
diffstat 42 files changed, 50 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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.."
--- 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"
--- /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