# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1542583897 0
# Node ID 92a3afcbccb9f7bd67d554708d66c42cf573031a
# Parent  0d042f1f87b4ace54839cfc92d6ec811c782a2f0
frame_na7_db_{fl,ir} component recipes with full OSL rebuild
renamed to frame_na7_db_{fl,ir}-full

diff -r 0d042f1f87b4 -r 92a3afcbccb9 components/frame_na7_db_fl
--- a/components/frame_na7_db_fl	Sun Nov 18 23:23:08 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# Building frame_na7_db_fl.lib using the GPF source bits we got with TCS3.2
-
-CFLAGS="-mw -x -pw2 -o3 -me -mt -g -mn"
-
-# Defines
-
-CPPFLAGS="-DNU_DEBUG -D_FF_RV_EXIST_ -DRUN_FLASH"
-CPPFLAGS="$CPPFLAGS -D_TARGET_ -D_NUCLEUS_"
-
-# Includes
-
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-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/gpf2/tst"
-
-# Source modules
-
-SRCDIR=$SRC/gpf3/frame
-
-cfile_plain $SRCDIR/frame.c
-cfile_plain $SRCDIR/vsi_sem.c
-cfile_plain $SRCDIR/vsi_com.c
-cfile_plain $SRCDIR/vsi_mem.c
-cfile_plain $SRCDIR/vsi_tim.c
-cfile_plain $SRCDIR/vsi_mis.c
-cfile_plain $SRCDIR/vsi_drv.c
-cfile_plain $SRCDIR/vsi_trc.c
-cfile_plain $SRCDIR/vsi_pro.c
-cfile_plain $SRCDIR/xalert.c
-cfile_plain $SRCDIR/route.c
-cfile_plain $SRCDIR/prf_func.c
-cfile_plain $SRCDIR/frm_ext.c
-cfile_plain $SRCDIR/frame_version.c
-
-# OSL
-
-# drop -o3
-CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
-
-SRCDIR=$SRC/gpf2/osl
-
-cfile_plain $SRCDIR/os_com_fl.c
-cfile_plain $SRCDIR/os_drv.c
-cfile_plain $SRCDIR/os_isr.c
-cfile_plain $SRCDIR/os_mem_fl.c
-cfile_plain $SRCDIR/os_mis_fl.c
-cfile_plain $SRCDIR/os_pro_fl.c
-cfile_plain $SRCDIR/os_sem_fl.c
-cfile_plain $SRCDIR/os_tim_fl.c
diff -r 0d042f1f87b4 -r 92a3afcbccb9 components/frame_na7_db_fl-full
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/frame_na7_db_fl-full	Sun Nov 18 23:31:37 2018 +0000
@@ -0,0 +1,52 @@
+# Building frame_na7_db_fl.lib using the GPF source bits we got with TCS3.2
+# This version rebuilds the OSL part from our reconstructed source
+
+CFLAGS="-mw -x -pw2 -o3 -me -mt -g -mn"
+
+# Defines
+
+CPPFLAGS="-DNU_DEBUG -D_FF_RV_EXIST_ -DRUN_FLASH"
+CPPFLAGS="$CPPFLAGS -D_TARGET_ -D_NUCLEUS_"
+
+# Includes
+
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
+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/gpf2/tst"
+
+# Source modules
+
+SRCDIR=$SRC/gpf3/frame
+
+cfile_plain $SRCDIR/frame.c
+cfile_plain $SRCDIR/vsi_sem.c
+cfile_plain $SRCDIR/vsi_com.c
+cfile_plain $SRCDIR/vsi_mem.c
+cfile_plain $SRCDIR/vsi_tim.c
+cfile_plain $SRCDIR/vsi_mis.c
+cfile_plain $SRCDIR/vsi_drv.c
+cfile_plain $SRCDIR/vsi_trc.c
+cfile_plain $SRCDIR/vsi_pro.c
+cfile_plain $SRCDIR/xalert.c
+cfile_plain $SRCDIR/route.c
+cfile_plain $SRCDIR/prf_func.c
+cfile_plain $SRCDIR/frm_ext.c
+cfile_plain $SRCDIR/frame_version.c
+
+# OSL
+
+# drop -o3
+CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
+
+SRCDIR=$SRC/gpf2/osl
+
+cfile_plain $SRCDIR/os_com_fl.c
+cfile_plain $SRCDIR/os_drv.c
+cfile_plain $SRCDIR/os_isr.c
+cfile_plain $SRCDIR/os_mem_fl.c
+cfile_plain $SRCDIR/os_mis_fl.c
+cfile_plain $SRCDIR/os_pro_fl.c
+cfile_plain $SRCDIR/os_sem_fl.c
+cfile_plain $SRCDIR/os_tim_fl.c
diff -r 0d042f1f87b4 -r 92a3afcbccb9 components/frame_na7_db_ir
--- a/components/frame_na7_db_ir	Sun Nov 18 23:23:08 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# Building frame_na7_db_ir.lib using the GPF source bits we got with TCS3.2
-
-CFLAGS="-mw -x -pw2 -o3 -me -mt -g -mn"
-
-# Defines
-
-CPPFLAGS="-DNU_DEBUG -D_FF_RV_EXIST_ -DRUN_INT_RAM"
-CPPFLAGS="$CPPFLAGS -D_TARGET_ -D_NUCLEUS_"
-
-# Includes
-
-CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
-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/gpf2/tst"
-
-# Source modules
-
-SRCDIR=$SRC/gpf3/frame
-
-cfile_plain $SRCDIR/frame.c
-cfile_plain $SRCDIR/vsi_sem.c
-cfile_plain $SRCDIR/vsi_com.c
-cfile_plain $SRCDIR/vsi_mem.c
-cfile_plain $SRCDIR/vsi_tim.c
-cfile_plain $SRCDIR/vsi_mis.c
-cfile_plain $SRCDIR/vsi_drv.c
-cfile_plain $SRCDIR/vsi_trc.c
-cfile_plain $SRCDIR/vsi_pro.c
-cfile_plain $SRCDIR/xalert.c
-cfile_plain $SRCDIR/route.c
-cfile_plain $SRCDIR/prf_func.c
-cfile_plain $SRCDIR/frm_ext.c
-cfile_plain $SRCDIR/frame_version.c
-
-# OSL
-
-# drop -o3
-CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
-
-SRCDIR=$SRC/gpf2/osl
-
-cfile_plain $SRCDIR/os_com_ir.c
-cfile_plain $SRCDIR/os_mem_ir.c
-cfile_plain $SRCDIR/os_mis_ir.c
-cfile_plain $SRCDIR/os_pro_ir.c
-cfile_plain $SRCDIR/os_sem_ir.c
-cfile_plain $SRCDIR/os_tim_ir.c
diff -r 0d042f1f87b4 -r 92a3afcbccb9 components/frame_na7_db_ir-full
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/frame_na7_db_ir-full	Sun Nov 18 23:31:37 2018 +0000
@@ -0,0 +1,50 @@
+# Building frame_na7_db_ir.lib using the GPF source bits we got with TCS3.2
+# This version rebuilds the OSL part from our reconstructed source
+
+CFLAGS="-mw -x -pw2 -o3 -me -mt -g -mn"
+
+# Defines
+
+CPPFLAGS="-DNU_DEBUG -D_FF_RV_EXIST_ -DRUN_INT_RAM"
+CPPFLAGS="$CPPFLAGS -D_TARGET_ -D_NUCLEUS_"
+
+# Includes
+
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame"
+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/gpf2/tst"
+
+# Source modules
+
+SRCDIR=$SRC/gpf3/frame
+
+cfile_plain $SRCDIR/frame.c
+cfile_plain $SRCDIR/vsi_sem.c
+cfile_plain $SRCDIR/vsi_com.c
+cfile_plain $SRCDIR/vsi_mem.c
+cfile_plain $SRCDIR/vsi_tim.c
+cfile_plain $SRCDIR/vsi_mis.c
+cfile_plain $SRCDIR/vsi_drv.c
+cfile_plain $SRCDIR/vsi_trc.c
+cfile_plain $SRCDIR/vsi_pro.c
+cfile_plain $SRCDIR/xalert.c
+cfile_plain $SRCDIR/route.c
+cfile_plain $SRCDIR/prf_func.c
+cfile_plain $SRCDIR/frm_ext.c
+cfile_plain $SRCDIR/frame_version.c
+
+# OSL
+
+# drop -o3
+CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
+
+SRCDIR=$SRC/gpf2/osl
+
+cfile_plain $SRCDIR/os_com_ir.c
+cfile_plain $SRCDIR/os_mem_ir.c
+cfile_plain $SRCDIR/os_mis_ir.c
+cfile_plain $SRCDIR/os_pro_ir.c
+cfile_plain $SRCDIR/os_sem_ir.c
+cfile_plain $SRCDIR/os_tim_ir.c
diff -r 0d042f1f87b4 -r 92a3afcbccb9 configs/hybrid-gpf
--- a/configs/hybrid-gpf	Sun Nov 18 23:23:08 2018 +0000
+++ b/configs/hybrid-gpf	Sun Nov 18 23:31:37 2018 +0000
@@ -76,8 +76,8 @@
 
 # GPF
 build_lib ccd_na7_db
-build_lib frame_na7_db_fl
-build_lib frame_na7_db_ir
+build_lib frame_na7_db_fl full
+build_lib frame_na7_db_ir full
 lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
 build_lib misc_na7_db_fl
 build_lib misc_na7_db_ir