FreeCalypso > hg > ffs-editor

changeset 6:6a05d91d1435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components: first round of changes for the FFS editor
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 15 May 2020 02:39:15 +0000
parents 3b367f330821
children d0c841cb75c7
files components/buzzer components/dar components/drivers_flash components/etm components/ffs components/ffs_drv components/main components/riviera_core_flash components/riviera_cust_flash
diffstat 9 files changed, 40 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/components/buzzer	Fri May 15 02:20:23 2020 +0000
+++ b/components/buzzer	Fri May 15 02:39:15 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
--- a/components/dar	Fri May 15 02:20:23 2020 +0000
+++ b/components/dar	Fri May 15 02:39:15 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
--- a/components/drivers_flash	Fri May 15 02:20:23 2020 +0000
+++ b/components/drivers_flash	Fri May 15 02:39:15 2020 +0000
@@ -9,7 +9,7 @@
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
@@ -45,7 +45,7 @@
 
 # 1st set of source modules
 
-c_file $SRCDIR/dsp_dwnld/leadapi.c
+#c_file $SRCDIR/dsp_dwnld/leadapi.c
 c_file $SRCDIR/inth/niq.c
 c_file $SRCDIR/uart/uart.c
 c_file $SRCDIR/inth/inth.c
@@ -53,7 +53,7 @@
 c_file $SRCDIR/timer/timer1.c
 c_file $SRCDIR/timer/timer2.c
 c_file $SRCDIR/timer/timer_sec.c
-c_file $SRCDIR/security/certificate.c
+#c_file $SRCDIR/security/certificate.c
 c_file $SRCDIR/clkm/clkm.c
 c_file $SRCDIR/armio/armio.c
 
@@ -63,7 +63,7 @@
 
 c_file $SRCDIR/spi/spi_drv.c
 c_file $SRCDIR/abb/abb.c
-c_file $SRCDIR/abb/abb_core_inth.c
+#c_file $SRCDIR/abb/abb_core_inth.c
 
 # niq32
 
--- a/components/etm	Fri May 15 02:20:23 2020 +0000
+++ b/components/etm	Fri May 15 02:39:15 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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,6 +50,6 @@
 c_file $SRCDIR/etm_api.c
 c_file $SRCDIR/etm_trace.c
 #c_file $SRCDIR/etm_at.c
-c_file $SRCDIR/etm_audio.c
+#c_file $SRCDIR/etm_audio.c
 c_file $SRCDIR/etm_tmcore.c
-c_file $SRCDIR/etm_tmpwr.c
+#c_file $SRCDIR/etm_tmpwr.c
--- a/components/ffs	Fri May 15 02:20:23 2020 +0000
+++ b/components/ffs	Fri May 15 02:39:15 2020 +0000
@@ -6,10 +6,10 @@
 # Defines
 
 CPPFLAGS="-DWITH_TFFS=0 -DTMFFS2"
-if [ "$SRVC" != 0 ]
-then
-	CPPFLAGS="$CPPFLAGS -DFAX_AND_DATA=FAX_AND_DATA"
-fi
+#if [ "$SRVC" != 0 ]
+#then
+#	CPPFLAGS="$CPPFLAGS -DFAX_AND_DATA=FAX_AND_DATA"
+#fi
 CPPFLAGS="$CPPFLAGS -DTOOL_CHOICE=0 -D_TMS470"
 
 # Includes
@@ -17,8 +17,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
--- a/components/ffs_drv	Fri May 15 02:20:23 2020 +0000
+++ b/components/ffs_drv	Fri May 15 02:39:15 2020 +0000
@@ -6,10 +6,10 @@
 # Defines
 
 CPPFLAGS="-DWITH_TFFS=0 -DTMFFS2"
-if [ "$SRVC" != 0 ]
-then
-	CPPFLAGS="$CPPFLAGS -DFAX_AND_DATA=FAX_AND_DATA"
-fi
+#if [ "$SRVC" != 0 ]
+#then
+#	CPPFLAGS="$CPPFLAGS -DFAX_AND_DATA=FAX_AND_DATA"
+#fi
 CPPFLAGS="$CPPFLAGS -DTOOL_CHOICE=0 -D_TMS470"
 
 # Includes
@@ -17,8 +17,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
@@ -55,7 +55,7 @@
 
 c_file $SRCDIR/cfgffs.c
 c_file $SRCDIR/dev.c
-c_file $SRCDIR/pcmcode.c
+#c_file $SRCDIR/pcmcode.c
 c_file $SRCDIR/task.c
 c_file $SRCDIR/tmffs.c
 
@@ -69,8 +69,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
--- a/components/main	Fri May 15 02:20:23 2020 +0000
+++ b/components/main	Fri May 15 02:39:15 2020 +0000
@@ -16,8 +16,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
@@ -58,57 +58,10 @@
 c_file $SRCDIR/main.c
 c_file $SRCDIR/sys_dummy.c
 
-# mem_load.c and int.s are for the TMS470 version only
-
-if [ "$COMPILER" = tms470 ]
-then
-
-# Different CFLAGS for mem_load.c
-
-CFLAGS="-o -mw -me -pw2"
-
-c_file $SRCDIR/mem_load.c
-
-# Assembly module
-
-ASMFLAGS=-me
-ASMFLAGS="$ASMFLAGS -dBOARD=41"
-ASMFLAGS="$ASMFLAGS -dCHIPSET=$CHIPSET"
-ASMFLAGS="$ASMFLAGS -dLONG_JUMP=3"
-ASMFLAGS="$ASMFLAGS -dTOOL_CHOICE=0"
-ASMFLAGS="$ASMFLAGS -dR2D_ASM=0"
-ASMFLAGS="$ASMFLAGS -dR2D_LCD_TEST=0"
-ASMFLAGS="$ASMFLAGS -dTI_PROFILER=0"
-ASMFLAGS="$ASMFLAGS -dTI_NUC_MONITOR=0"
-ASMFLAGS="$ASMFLAGS -dL1_GPRS=$GPRS"
-ASMFLAGS="$ASMFLAGS -dOP_WCP=0"
-ASMFLAGS="$ASMFLAGS -dWCP_PROF=0"
-
-if [ "$TARGET" = c155 ]
-then
-	ASMFLAGS="$ASMFLAGS -dC155_TARGET=1"
-else
-	ASMFLAGS="$ASMFLAGS -dC155_TARGET=0"
-fi
-
-if [ "$RF" = 12 ]
-then
-	ASMFLAGS="$ASMFLAGS -dVCXO_26MHZ=1"
-else
-	ASMFLAGS="$ASMFLAGS -dVCXO_26MHZ=0"
-fi
-
-asm_file $SRCDIR/int.s
-
-fi
-
 # a couple of assembly modules for the gcc-built version
 
-if [ "$COMPILER" = gcc ]
-then
-	ASMFLAGS=-mthumb-interwork
-	CPPFLAGS=
+ASMFLAGS=-mthumb-interwork
+CPPFLAGS=
 
-	asm_file $SRCDIR/gcc/exceptions.S
-	asm_file $SRCDIR/gcc/int_dummy.S
-fi
+asm_file $SRCDIR/gcc/exceptions.S
+asm_file $SRCDIR/gcc/int_dummy.S
--- a/components/riviera_core_flash	Fri May 15 02:20:23 2020 +0000
+++ b/components/riviera_core_flash	Fri May 15 02:39:15 2020 +0000
@@ -9,8 +9,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"
--- a/components/riviera_cust_flash	Fri May 15 02:20:23 2020 +0000
+++ b/components/riviera_cust_flash	Fri May 15 02:39:15 2020 +0000
@@ -4,17 +4,10 @@
 CFLAGS_gcc="-g -O2 -fno-builtin -mthumb-interwork -mthumb"
 CPPFLAGS="-DTOOL_CHOICE=0 -D_TMS470"
 
-if [ "$MMI" = 0 ]
+CPPFLAGS="$CPPFLAGS -DPSEUDO_MODEM_KEEPALIVE"
+if [ "$TARGET" = pirelli -a "$RVTMUX_ON_MODEM" = 0 ]
 then
-	case "$TARGET" in
-		c11x|c139|c155|j100)
-			CPPFLAGS="$CPPFLAGS -DPSEUDO_MODEM_KEEPALIVE"
-			;;
-		pirelli)
-			CPPFLAGS="$CPPFLAGS -DPSEUDO_MODEM_KEEPALIVE"
-			CPPFLAGS="$CPPFLAGS -DPSEUDO_MODEM_USB"
-			;;
-	esac
+	CPPFLAGS="$CPPFLAGS -DPSEUDO_MODEM_USB"
 fi
 
 # Includes
@@ -22,8 +15,8 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/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"