Removed tools and debug trace files, Makefile fixes

Change-Id: I28234a83bb0b01ba5adda25d03ab415ad00c3f57
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14525
Reviewed-by: Stephan Broyles <sbroyles@us.ibm.com>
Tested-by: Stephan Broyles <sbroyles@us.ibm.com>

2 files changed, 29 insertions, 131 deletions

diff --git a/src/occApplet/productApplet/Makefile b/src/occApplet/productApplet/Makefile
index e87e37d..f95f41f 100755
--- a/src/occApplet/productApplet/Makefile
+++ b/src/occApplet/productApplet/Makefile
@@ -1,39 +1,8 @@
-# $Id$
-#  @file Makefile
-#
-#  @brief OCC Product Applet Makefile
-#
 
-#  @page ChangeLogs Change Logs
-#  @section Makefile
-#  @verbatim
-#
-#
-# Change Log ******************************************************************
-# Flag     Defect/Feature  User        Date         Description
-# ------   --------------  ----------  ------------ -----------
-# @pb001                   pbavari     07/18/2011   Created
-# @ani01                   abagepa     08/08/2011   Creating to "test" applets
-#                                                   as placeholders for real applets
-#                                                   Update to include for easier compiling
-# @pb006                   pbavari     09/16/2011   Display size support
-# @pb004                   pbavari     09/20/2011   Initialization Section support
-# @pb00A                   pbavari     11/14/2011   Moved sensor_init from applet to init section
-# @th005                   thallet     11/23/2011   Sensor querySensorList support
-# @pb00C                   pbavari     01/20/2012   Added debug_trace.mk
-# @rc003                   rickylie    02/03/2012   Verify & Clean Up OCC Headers & Comments
-# @at009   859308          alvinwan    10/15/2012   Added tracepp support
-# @th029                   thallet     01/23/2013   MD5sum in applet version & include aplt headers
-#
-# @endverbatim
-#
-
-# >> gitprep
 ifndef ROOTPATH
 ROOTPATH = $(shell pwd)/../../
 export OCCROOT = $(ROOTPATH)
 endif
-# << gitprep
 
 #*******************************************************************************
 # mk variable Declaration
@@ -44,71 +13,44 @@ SSX = ../../ssx
 PRODUCTAPPLET = .
 LIB = ../../lib
 
-# New product applet source file must to listed as part of the SOURCES variable
-# to create product applet image. Prodcut applet images will be added to the
-# mainstore single image in the order source files are listed in SOURCES 
-# variable. 
-# @ani01c 
-# Note: New applets must be updated in the applet enum list
-#       see occ/aplt/appletManager.h
+# New product applet source files must to listed in productappletfiles.mk
+# Note: New applets must be given an ID in src/occ/aplt/incl/appletId.
 
-# >> gitprep
-# Add missing flags for GNU build
 LDFLAGS = -L $(SSX)/ssx -L $(SSX)/ppc32 -L $(SSX)/ppc405 -L $(SSX)/pgp \
-	  -L $(OCC) -L $(LIB) -lssx -lppc32 --oformat=elf32-powerpc -melf32ppc
+-L $(OCC) -L $(LIB) -lssx -lppc32 --oformat=elf32-powerpc -melf32ppc
+
 buildImage = $(LD) -R $(OCC)/occ.out $(obj) -Tlinkscript $(LDFLAGS) \
-	-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out;\
-	$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \
-	$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \
-	$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; 
-# << gitprep
+-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out; \
+$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \
+$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \
+$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; 
 
-image =  $(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin combineImage;\
-         $(BOOTLOADER)/imageHdrScript $(basename $(obj)).out displaySize;
+image = $(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin combineImage; \
+$(BOOTLOADER)/imageHdrScript $(basename $(obj)).out displaySize;
              
 #*******************************************************************************
 # Includes
 #*******************************************************************************
 include $(SSX)/pgp/ssx.mk
-#$pb00Ca - Added for debug traces
-include $(OCC)/debug_trace.mk
 include productappletfiles.mk
 
-# >> gitprep
-# Add needed includes for GNU build
 INCLUDES = -I. -I$(OCC)/incl -I$(OCC)/errl -I$(OCC)/trac -I$(LIB) -I$(SSX)/ssx \
-			-I$(OCC)/sensor -I$(OCC) -I$(OCC)/rtls -I$(OCC)/cmdh -I$(OCC)/pss -I$(OCC)/gpe \
-			-I$(OCC)/aplt/incl -I$(OCC)/aplt -I$(OCC)/cent -I$(OCC)/proc -I$(OCC)/thread \
-			-I$(SSX)/ppc405 -I$(SSX)/pgp -I$(SSX)/ppc32 -I$(SSX)/pgp/registers
-# << gitprep
+-I$(OCC)/sensor -I$(OCC) -I$(OCC)/rtls -I$(OCC)/cmdh -I$(OCC)/pss -I$(OCC)/gpe \
+-I$(OCC)/aplt/incl -I$(OCC)/aplt -I$(OCC)/cent -I$(OCC)/proc -I$(OCC)/thread \
+-I$(SSX)/ppc405 -I$(SSX)/pgp -I$(SSX)/ppc32 -I$(SSX)/pgp/registers
 
 #*******************************************************************************
-# Flags
+# Defs
 #*******************************************************************************
-#D = -DSIMICS_MAGIC_PANIC=1 \
-     -DINITIALIZE_SIMICS_IO=1
-
 DEFS += $(D)
 DEFS += -DAPPLET_BUILD=1
-# >> gitprep
-# Very important we build applets with custom cfg header
 DEFS += -DUSE_SSX_APP_CFG_H=1
-# << gitprep
 
-# If this makefile is called as "make NO_TRAC_STRINGS=1" then trace strings 
-# won't be built into the image.  This will be used for metrics regarded to the 
-# realistic OCC Code Size. Note that "make clean" must be run before this define
-# will be picked up by the compiler, otherwise previously compiled objects will 
-# be used.  You can also see the space used by strings by running: 
-# strings occ.bin | \grep "ERR\|INF\|IMP" | sed 's/^...: %s: //g' | wc -m
-ifdef NO_TRAC_STRINGS
-D += -DNO_TRAC_STRINGS=1  
-endif
-
-# Do not use SDA sections for product applet
+# Note: Do not use SDA sections for product applet
 GCC-CFLAGS = -c -g -Wall -fsigned-char -msoft-float -pipe \
-             -Wa,-m405 -m32 -mcpu=405 -mmultiple -mstring -meabi \
-             -ffreestanding -Os -mno-sdata
+-Wa,-m405 -m32 -mcpu=405 -mmultiple -mstring -meabi \
+-ffreestanding -Os -mno-sdata
+
 #*******************************************************************************
 # Compilation 
 #*******************************************************************************
@@ -128,3 +70,4 @@ combineImage:
 #*******************************************************************************
 clean: 
 	rm -f *.o *.out *.bin *.dis *.map *.hash linkscript
+
diff --git a/src/occApplet/testApplet/Makefile b/src/occApplet/testApplet/Makefile
index 9a5ea0b..dba7068 100755
--- a/src/occApplet/testApplet/Makefile
+++ b/src/occApplet/testApplet/Makefile
@@ -1,92 +1,46 @@
-#  @file Makefile
-#
-#  @brief OCC Test Applet Makefile
-#
 
-#  @page ChangeLogs Change Logs
-#  @section Makefile
-#  @verbatim
-#
-#
-# Change Log ******************************************************************
-# Flag     Defect/Feature  User        Date         Description
-# ------   --------------  ----------  ------------ -----------
-# @pb001                   pbavari     07/18/2011   Created
-# @pb002                   pbavari     08/17/2011   Added sensorTest.c
-# @cc000                   cjcain      08/30/2011   Added apssTest.c
-# @pb004                   pbavari     09/15/2011   Added support for calling
-#                                                   product aplt from test aplt
-# @02                      tapiar      10/03/2011   Adding new dir includes
-# @dw000                   dwodham     12/13/2011   Add include for appletId
-# @rc001                   rickylie    01/16/2012   Include debug_trace.mk
-# @rc003                   rickylie    02/03/2012   Verify & Clean Up OCC Headers & Comments
-# @at002                   alvinwan    02/10/2012   Added errlTest.c
-# @at009   859308          alvinwan    10/15/2012   Added tracepp support
-# @th029                   thallet     01/23/2013   Added md5sum in version
-#
-# @endverbatim
-#
-
-# >> gitprep
 ifndef ROOTPATH
 ROOTPATH = $(shell pwd)/../../
 export OCCROOT = $(ROOTPATH)
 endif
-# << gitprep
 
 #*******************************************************************************
-# mk variable Declaration
+# make variables
 #*******************************************************************************
 OCC = ../../occ
 BOOTLOADER = ../../occBootLoader
 SSX = ../../ssx
 TESTAPPLET = .
 LIB = ../../lib
-
-# >> gitprep
-# Add missing link flags fir GNU build
 LDFLAGS += --oformat=elf32-powerpc -melf32ppc
 
 buildImage = $(LD) -R $(OCC)/occ.out $(obj) -Tlinkscript $(LDFLAGS) \
-			-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out;\
-	        $(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \
-			$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \
-			$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; \
-# << gitprep
+-Map $(basename $(obj)).map -Bstatic -o $(basename $(obj)).out; \
+$(OBJCOPY) -I elf32-powerpc -O binary $(basename $(obj)).out $(basename $(obj)).bin; \
+$(OBJDUMP) -d $(basename $(obj)).out > $(basename $(obj)).dis; \
+$(BOOTLOADER)/imageHdrScript $(basename $(obj)).bin `md5sum $(OCC)/occ.out | cut -c 1-4`; \
 
 #*******************************************************************************
 # Includes
 #*******************************************************************************
 include $(SSX)/pgp/ssx.mk
-#@rc001a
-include $(OCC)/debug_trace.mk
 include testappletfiles.mk
 
 INCLUDES = -I. -I$(OCC)/rtls -I$(OCC)/incl -I$(OCC)/errl -I$(OCC)/trac -I$(LIB) -I$(SSX)/ssx 
 INCLUDES += -I$(SSX)/ppc405 -I$(SSX)/pgp -I$(SSX)/ppc32 -I$(SSX)/pgp/registers
 INCLUDES += -I$(OCC)/sensor -I$(OCC)/pss -I$(OCC)/gpe -I$(OCC) -I$(OCC)/aplt -I$(OCC)/dcom 
-# >> gitprep
-# Add missing include paths
 INCLUDES += -I$(OCC)/aplt/incl -I$(OCC)/cmdh
-# << gitprep
 
 #*******************************************************************************
-# Flags
+# Defs
 #*******************************************************************************
-#D = -DSIMICS_MAGIC_PANIC=1 \
-     -DINITIALIZE_SIMICS_IO=1
-
 DEFS += $(D)
-DEFS +=  -DOCC=1 \
-    	 -DUSE_SSX_APP_CFG_H=1
+DEFS += -DOCC=1 -DUSE_SSX_APP_CFG_H=1
 
 # Do not use SDA sections for product applet 
-# >> gitprep
-# Add missing compile flags for GNU build
 GCC-CFLAGS = -c -g -Wall -fsigned-char -msoft-float -pipe \
-             -m32 -Wa,-m405 -mcpu=405 -mmultiple -mstring -meabi \
-             -ffreestanding -Os -mno-sdata 
-# << gitprep
+-m32 -Wa,-m405 -mcpu=405 -mmultiple -mstring -meabi \
+-ffreestanding -Os -mno-sdata 
 
 #*******************************************************************************
 # Compilation 
@@ -105,3 +59,4 @@ combineImage:
 #*******************************************************************************
 clean: 
 	rm -f *.o *.out *.bin *.dis *.map *.hash linkscript
+