--- 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