Modification for removing makedep.exe requirement

Fix for make clean
Fix for avoiding cgtools [ TI path for CGTOOLs] requirement in the makefile

diff --git a/setenv b/setenv
index 885ea0f7eda7f6cef90efeee006fc7acde6c8048..0f66b9caa624782c10d4eb06fef8c864d418d915 100644 (file)
--- a/setenv
+++ b/setenv
@@ -5,10 +5,8 @@ export C_DIR="$C6X_C_DIR"
 
 PATH=$C6X_BASE_DIR/bin:$PATH
 
 
 PATH=$C6X_BASE_DIR/bin:$PATH
 

-rm hacky-stuff/cgtools; ln -sf $C6X_BASE_DIR hacky-stuff/cgtools

 
 

-export TOOLSC6X=$PWD/hacky-stuff
+export TOOLSC6X=$C6X_BASE_DIR

 export TOOLSC6XDOS=$TOOLSC6X
 export TOOLSC6XDOS=$TOOLSC6X

-export MAKEDEPPATH="gawk -f $PWD/src/make/makedep/makedep.gawk "
-export TOOLSBIOSC6XDOS=$PWD/hacky-stuff/bios-stuff-qq
+export TOOLSBIOSC6XDOS=$TOOLSC6X

 
 

diff --git a/src/hw/c64x/make/makefile b/src/hw/c64x/make/makefile
index a72b1fe2b83842f6258ce75ae55aed5774128825..46c6e51d69e6d812e5548f64c983974b06e246d2 100644 (file)
--- a/src/hw/c64x/make/makefile
+++ b/src/hw/c64x/make/makefile
@@ -169,7 +169,8 @@ gen_cdefdep:
        @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) $(DEBUG) > cdefdep.tmp
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 
        @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) $(DEBUG) > cdefdep.tmp
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 

-
+clean:
+       make -f makestg2 clean2 ARCH=c64x  

 
 
 
 
 
 

diff --git a/src/hw/c64x/make/makestg2 b/src/hw/c64x/make/makestg2
new file mode 100644 (file)
index 0000000..045bcd1
--- /dev/null
+++ b/src/hw/c64x/make/makestg2
@@ -0,0 +1,31 @@
+#*********************************************************************************
+#* FILE PURPOSE: Build the I2C EEPROM reader
+#*********************************************************************************
+#* FILE NAME: makestg2
+#*
+#* DESCRIPTION: Builds the i2c reader
+#*
+#*********************************************************************************
+
+
+DEVICES= c6455 c6472 c6474 c6474l c6457
+
+ifndef IBL_ROOT
+ IBL_ROOT=../..
+endif
+
+
+export C6X_C_DIR
+
+export ARCH
+export TARGET
+
+
+clean2: $(CLEAN_MODULES)
+       @rm -f $(OBJS)
+       @rm -f $(subst .c,.dc,$(CSRC))
+
+$(CLEAN_MODULES):
+       @echo cleaning $(subst clean_, ,$@)
+       make -C $(IBL_ROOT)/$(subst clean,,$@)/$(ARCH)/make clean
+

diff --git a/src/make/Makefile b/src/make/Makefile
index 5842f3524dc5a4a4a6ca897e73e0ceedc4e46fd5..878ebeee38d8db02402fe56e4cb4bcad16addb76 100644 (file)
--- a/src/make/Makefile
+++ b/src/make/Makefile
@@ -82,16 +82,16 @@ $(IBLS_C6X):
 
 # will need to add a line for each additional ARCH type added
 clean:
 
 # will need to add a line for each additional ARCH type added
 clean:

-       make -f makestg2 clean   ARCH=c64x
+       make -f makestg2 clean   ARCH=c64x TARGET=c6472

        make -f makestg2 cleant  ARCH=c64x TARGET=c6472
        make -f makestg2 cleant  ARCH=c64x TARGET=c6474
        make -f makestg2 cleant  ARCH=c64x TARGET=c6474l
        make -f makestg2 cleant  ARCH=c64x TARGET=c6457
        make -C ../util/bconvert       clean
        make -C ../util/btoccs         clean
        make -f makestg2 cleant  ARCH=c64x TARGET=c6472
        make -f makestg2 cleant  ARCH=c64x TARGET=c6474
        make -f makestg2 cleant  ARCH=c64x TARGET=c6474l
        make -f makestg2 cleant  ARCH=c64x TARGET=c6457
        make -C ../util/bconvert       clean
        make -C ../util/btoccs         clean

-       make -C ../util/i2cConfig      clean
-       make -C ../util/nandWriter     clean
-       make -C ../util/romparse       clean
+       make -C ../util/i2cConfig      clean  ARCH=c64x TARGET=c6472
+       make -C ../util/nandWriter     clean  ARCH=c64x TARGET=c6472
+       make -C ../util/romparse       clean  ARCH=c64x TARGET=c6472

        make -C ../test/test1              clean
        make -C ../test/test2              clean
 
        make -C ../test/test1              clean
        make -C ../test/test2              clean
 

diff --git a/src/make/c64x/bootinc.mk b/src/make/c64x/bootinc.mk
index d9fb8d09229736c26c8bb2e8184d223b9e5331b5..1c3014add8ff445e3522768eccca93b0fc7752b6 100644 (file)
--- a/src/make/c64x/bootinc.mk
+++ b/src/make/c64x/bootinc.mk
@@ -27,7 +27,7 @@ endif
 CFLAGS+= -ms2
 
 ifdef RTLIBS
 CFLAGS+= -ms2
 
 ifdef RTLIBS

-RTLIBS = $(TOOLSC6X)/cgtools/lib/rts6400.lib
+RTLIBS = $(TOOLSC6X)/lib/rts6400.lib

 endif
 
 # Rule to run splint. Form the splint
 endif
 
 # Rule to run splint. Form the splint

diff --git a/src/make/c64x/makedefs.mk b/src/make/c64x/makedefs.mk
index f5158c89abb41cda2e06e3668a81c80b0376b79d..6e7a1ed2d2c841cefa7e35f9508b5b4b1939654d 100644 (file)
--- a/src/make/c64x/makedefs.mk
+++ b/src/make/c64x/makedefs.mk
@@ -9,12 +9,12 @@
 #* (C) Copyright 1999 TELOGY Networks, Inc.             
 #*******************************************************************************
 
 #* (C) Copyright 1999 TELOGY Networks, Inc.             
 #*******************************************************************************
 

-CC          = $(TOOLSC6X)/cgtools/bin/cl6x
-AS          = $(TOOLSC6X)/cgtools/bin/cl6x
-LD          = $(TOOLSC6X)/cgtools/bin/cl6x -z
-ARIN        = $(TOOLSC6X)/cgtools/bin/ar6x -rq
-AROUT       = $(TOOLSC6X)/cgtools/bin/ar6x -xq 
-HEX6X          = $(TOOLSC6X)/cgtools/bin/hex6x
+CC          = $(TOOLSC6X)/bin/cl6x
+AS          = $(TOOLSC6X)/bin/cl6x
+LD          = $(TOOLSC6X)/bin/cl6x -z
+ARIN        = $(TOOLSC6X)/bin/ar6x -rq
+AROUT       = $(TOOLSC6X)/bin/ar6x -xq 
+HEX6X          = $(TOOLSC6X)/bin/hex6x

 CDBTOOL     = $(COMSPEC) /c $(TOOLSBIOSCDBC6X)\gconfgen
 MAKEDEP     = $(MAKEDEPPATH)
 MAKEDEP_OPT = -q
 CDBTOOL     = $(COMSPEC) /c $(TOOLSBIOSCDBC6X)\gconfgen
 MAKEDEP     = $(MAKEDEPPATH)
 MAKEDEP_OPT = -q


@@ -45,9 +45,9 @@ endif
 CPUFLAGS   = -mv6400+
 
 ifeq ($(ENDIAN),big)
 CPUFLAGS   = -mv6400+
 
 ifeq ($(ENDIAN),big)

-  ALLFARLIB       = $(TOOLSC6XDOS)/cgtools/lib/rts64pluse.lib
+  ALLFARLIB       = $(TOOLSC6XDOS)/lib/rts64pluse.lib

 else
 else

-  ALLFARLIB       = $(TOOLSC6XDOS)/cgtools/lib/rts64plus.lib
+  ALLFARLIB       = $(TOOLSC6XDOS)/lib/rts64plus.lib

 endif
 
 RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
 endif
 
 RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))


@@ -106,9 +106,11 @@ ifeq ($(ENDIAN),big)
  AFLAGS+= -me
 endif
 
  AFLAGS+= -me
 endif
 

+PPDEP_FLAGS  = -ppd=$(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP,$@)
+

 # Include files for standard (non siu) modules.  Also used by linker to find
 # library files.
 # Include files for standard (non siu) modules.  Also used by linker to find
 # library files.

-FSTDINC  =$(TOOLSC6XDOS)/cgtools/include;$(TOOLSC6XDOS)/cgtools/lib
+FSTDINC  =$(TOOLSC6XDOS)/include;$(TOOLSC6XDOS)/lib

 FSTDINC +=;$(TOOLSC6XDOS)/rtdx/include;$(TOOLSC6XDOS)/rtdx/lib
 FSTDINC +=;$(TOOLSBIOSC6XDOS)/bios/include;$(TOOLSBIOSC6XDOS)/bios/lib
 FSTDINC +=;$(TOOLSBIOSC6XDOS)/xdais/include;;$(TOOLSBIOSC6XDOS)/xdais/src/api
 FSTDINC +=;$(TOOLSC6XDOS)/rtdx/include;$(TOOLSC6XDOS)/rtdx/lib
 FSTDINC +=;$(TOOLSBIOSC6XDOS)/bios/include;$(TOOLSBIOSC6XDOS)/bios/lib
 FSTDINC +=;$(TOOLSBIOSC6XDOS)/xdais/include;;$(TOOLSBIOSC6XDOS)/xdais/src/api

diff --git a/src/make/c64x/makeeco.mk b/src/make/c64x/makeeco.mk
index dd218b5525198877d97d9810603c668762fe1858..62885a97ff596597f2c14e0f929d8022f0ea55be 100644 (file)
--- a/src/make/c64x/makeeco.mk
+++ b/src/make/c64x/makeeco.mk
@@ -81,6 +81,7 @@ TESTOBJS = $(patsubst %.s62, %.$(AOBJEXT), $(BIOSSFILES) \
 CLEAN_INTERMEDIATES = $(patsubst %.s62, %.lst, $(BIOSSFILES)  \
                         $(patsubst %.c, %.asm, $(CFILES) $(EXCFILES) $(TESTCFILES)) \
                         $(patsubst %.c, %.lst, $(CFILES) $(EXCFILES) $(TESTCFILES)) \
 CLEAN_INTERMEDIATES = $(patsubst %.s62, %.lst, $(BIOSSFILES)  \
                         $(patsubst %.c, %.asm, $(CFILES) $(EXCFILES) $(TESTCFILES)) \
                         $(patsubst %.c, %.lst, $(CFILES) $(EXCFILES) $(TESTCFILES)) \

+                        $(patsubst %.c, %.cif, $(CFILES) $(EXCFILES) $(TESTCFILES)) \

                         $(patsubst %.$(ASMEXT), %.lst, $(AFILES) $(EXAFILES) $(TESTAFILES)) \
                                                $(patsubst %.sa, %.asm, $(LINAFILES) $(TESTLINASMFILES)) \
                                                $(patsubst %.sa, %.lst, $(LINAFILES) $(TESTLINASMFILES)) \
                         $(patsubst %.$(ASMEXT), %.lst, $(AFILES) $(EXAFILES) $(TESTAFILES)) \
                                                $(patsubst %.sa, %.asm, $(LINAFILES) $(TESTLINASMFILES)) \
                                                $(patsubst %.sa, %.lst, $(LINAFILES) $(TESTLINASMFILES)) \


@@ -150,11 +151,11 @@ endif
 
 # how to build .c and .s files on c64x
 FNAMEDEF   = -dTNFNAME=$(notdir $<)
 
 # how to build .c and .s files on c64x
 FNAMEDEF   = -dTNFNAME=$(notdir $<)

-GGCCOMPILE = $(CC) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $< -eo.$(COBJEXT)
+GGCCOMPILE = $(CC) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $(FUNCOPTS) $< -eo.$(COBJEXT)

 GGLCOMPILE = $(CC) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $< -eo.$(LOBJEXT)
 GGLCOMPILE = $(CC) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $< -eo.$(LOBJEXT)

-GGACOMPILE = $(AS) $(AFLAGS) $(ADEFS) $< $@ -eo.$(AOBJEXT)
-GGCMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(CDEPINC)    -e$(COBJEXT) -o$$.$(CDEPEXT) $< 
-GGLMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(ADEPINC) -a -e$(AOBJEXT) -o$$.$(LDEPEXT) $<
+GGACOMPILE = $(AS) $(AFLAGS) $(ADEFS) $< -eo.$(AOBJEXT)
+GGCMAKEDEP = $(CC) $(PPDEP_FLAGS) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $(FUNCOPTS) $<
+GGLMAKEDEP = $(CC) $(PPDEP_FLAGS) $(CFLAGS) $(DCFLAGS) $(CDEFS) $(FNAMEDEF) $< 

 GGAMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(ADEPINC) -a -e$(AOBJEXT) -o$$.$(ADEPEXT) $<
 GGALMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(ALDEPINC) -a -e$(ALOBJEXT) -o$$.$(ALDEPEXT) $<
 
 GGAMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(ADEPINC) -a -e$(AOBJEXT) -o$$.$(ADEPEXT) $<
 GGALMAKEDEP = $(MAKEDEP) $(MAKEDEP_OPT) $(ALDEPINC) -a -e$(ALOBJEXT) -o$$.$(ALDEPEXT) $<
 


@@ -184,6 +185,9 @@ ADEPINC = $(subst \,/,-I$(subst ;, -I,$(C6X_A_DIR)))
 
 %.$(CDEPEXT): %.c
        $(GGCMAKEDEP)
 
 %.$(CDEPEXT): %.c
        $(GGCMAKEDEP)

+       sed -e 's/$(notdir $*).obj[ ]*:[ ]*/$(notdir $*).oc $(subst /,\/,$@): /' < $(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP,$@) > $(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP_2,$@)
+       sed -e "s/\\/\//g" < $(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP_2,$@) > $@
+       @$(RM) $(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP,$@) $(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP_2,$@)

 
 # dependency for .sa files
 %.$(LDEPEXT): %.sa
 
 # dependency for .sa files
 %.$(LDEPEXT): %.sa

diff --git a/src/make/makestg2 b/src/make/makestg2
index 456628b6bfc703e46f80c22f32302a544ededea6..7feb4e31c7fa799f9365fa9f2af614479e4ea5aa 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
@@ -67,7 +67,7 @@ clean: $(CLEAN_MODULES)
 
 $(CLEAN_MODULES):
        @echo cleaning $(subst clean_, ,$@)
 
 $(CLEAN_MODULES):
        @echo cleaning $(subst clean_, ,$@)

-       make -C $(IBL_ROOT)/$(subst clean_,,$@)/$(ARCH)/make clean
+       make -C $(IBL_ROOT)/$(subst clean_,,$@)/$(ARCH)/make clean ARCH=c64x TARGET=c6472

        
 cleant:
        rm -rf ibl_$(TARGET)/ibl_$(TARGET).out
        
 cleant:
        rm -rf ibl_$(TARGET)/ibl_$(TARGET).out

diff --git a/src/setupenv.bat b/src/setupenv.bat
index 89bad69712845ca28a95de6e2d4ca484f078b6cf..73e5ec29e4da2100fcbf4d3453cc3f41d0cb7706 100644 (file)
--- a/src/setupenv.bat
+++ b/src/setupenv.bat
@@ -1,29 +1,48 @@
+@REM ******************************************************************************
+@REM * FILE PURPOSE: Environment Setup for building Bootloader
+@REM ******************************************************************************
+@REM * FILE NAME: setupenv.bat
+@REM *
+@REM * DESCRIPTION: 
+@REM *  Configures and sets up the Build Environment for Bootloader in DOS environment. 
+@REM *  
+@REM *  Customers are expected to modify this file as per their build environment.
+@REM *
+@REM * USAGE:
+@REM *  setupenv.bat  
+@REM *              :bypass       
+@REM *                  configure environment without checking tools.  This option is
+@REM *                  is used when the user will manually configure the tools.
+@REM *  
+@REM *              :enable_write 
+@REM *      [*** DANGEROUS OPTION ***]
+@REM *                  Updates the tool in local drive  
+@REM *               
+@REM *              :No arguments: Sets the environment for building, Verifies local
+@REM *               tools and reports if any tool update is required   
+@REM *
+@REM * Copyright (C) 2010, Texas Instruments, Inc.
+@REM *****************************************************************************
+

 @echo off
 
 @echo off
 

-rem  Setup the ibl build environment
+REM  Setup the ibl build environment

 
 

+REM Modify following lines based on target environment for the toolset installed 
+REM Dependency is related to path for Cygwin and CGEN installed

 
 

-set PATH=t:\gen\gnu\99-11-01\cygwin-b20\H-i586-cygwin32\bin;c:\tools\c6xx\cgen6_1_12\c6000\cgtools\bin
-set PATH=%PATH%;%SystemRoot%\system32;%SystemRoot%;t:\ti_pdsp_cgen\20091120
+set PATH=t:\gen\gnu\99-11-01\cygwin-b20\H-i586-cygwin32\bin;C:\PROGRA~1\TEXASI~1\C6000C~1.12\bin
+set PATH=%PATH%;%SystemRoot%\system32;%SystemRoot%;

 
 set PERL=//t/gen/perl/activestate/5_6_1_635/bin/perl
 set PERLDOS=t:\gen\perl\activestate\5_6_1_635\bin\perl
 
 set CYGWINPATH=//t/gen/gnu/99-11-01/cygwin-b20/H-i586-cygwin32/bin
 
 set PERL=//t/gen/perl/activestate/5_6_1_635/bin/perl
 set PERLDOS=t:\gen\perl\activestate\5_6_1_635\bin\perl
 
 set CYGWINPATH=//t/gen/gnu/99-11-01/cygwin-b20/H-i586-cygwin32/bin

-set TOOLSC6X=c:/tools/c6xx/cgen6_1_12/c6000
-set TOOLSC6XDOS=c:\tools\c6xx\cgen6_1_12\c6000\
-
-set TOOLC6XSRC=t:\c6xx\cgen6_1_12\c6000
-set TOOLC6XDST=c:\tools\c6xx\cgen6_1_12\c6000
-
-rem splint libraries
-set LARCH_PATH=e:\splint-3.1.1\lib
+set TOOLSC6X=C:/PROGRA~1/TEXASI~1/C6000C~1.12
+set TOOLSC6XDOS=C:\PROGRA~1\TEXASI~1\C6000C~1.12

 
 

-rem Generate path to makedep, then set it 
-rm -f mkdeppath.bat
-rem sh -c "makedepdir=`pwd`;echo set MAKEDEPPATH=`dirname $makedepdir`/make/makedep/makedep.exe" >mkdeppath.bat
-sh -c "makedepdir=`pwd`;echo set MAKEDEPPATH=`pwd`/make/makedep/makedep.exe" >mkdeppath.bat
-call mkdeppath.bat
+set TOOLC6XSRC=t:\c6xx\cgen6_1_12\c6000\cgtools
+set TOOLC6XDST=C:\PROGRA~1\TEXASI~1\C6000C~1.12

 
 
 rem ************************* Tools Copy/Validation **************************
 
 
 rem ************************* Tools Copy/Validation **************************


@@ -67,7 +86,6 @@ rem **************************************************************************
 :error
 set TOOLS=
 set TOOLSDOS=
 :error
 set TOOLS=
 set TOOLSDOS=

-set MAKEDEPPATH=

 
 echo ============================== BAD TOOLS =================================
 echo * Build environment is NOT configured.  You may rerun script with:
 
 echo ============================== BAD TOOLS =================================
 echo * Build environment is NOT configured.  You may rerun script with:

diff --git a/src/test/test1/makefile b/src/test/test1/makefile
index 4557c468b11e457f5f9e6095bf7f1bb1ebe7ad30..ebc76bea2e867e3045a1482571fc0267d5b58849 100644 (file)
--- a/src/test/test1/makefile
+++ b/src/test/test1/makefile
@@ -45,7 +45,7 @@ test1.btbl: test1.out
        hex6x -a -order L -boot -e=_c_int00 -bootorg=0x0400 -memwidth32 -romwidth32 -o=test1.btbl test1.out
 
 test1.out: test1.obj test1.cmd
        hex6x -a -order L -boot -e=_c_int00 -bootorg=0x0400 -memwidth32 -romwidth32 -o=test1.btbl test1.out
 
 test1.out: test1.obj test1.cmd

-       cl6x -z -o test1.out -m test1.map test1.cmd $(TOOLSC6X)/cgtools/lib/rts64plus.lib
+       cl6x -z -o test1.out -m test1.map test1.cmd $(TOOLSC6X)/lib/rts64plus.lib

 
 
 test1.obj: test1.c
 
 
 test1.obj: test1.c

diff --git a/src/test/test2/makestage2 b/src/test/test2/makestage2
index 2b007c2f99cb8e1a25fe902e31692df486ca85bc..f58a61fd4e3a2b56e5a4f4170f8808365275a83d 100644 (file)
--- a/src/test/test2/makestage2
+++ b/src/test/test2/makestage2
@@ -9,11 +9,11 @@ CFLAGS= -g -c -mv 6400+ $(OPT)
 test2: gen_cdefdep utils test2_$(ENDIAN).blob
 
 ifeq ($(ENDIAN),little)
 test2: gen_cdefdep utils test2_$(ENDIAN).blob
 
 ifeq ($(ENDIAN),little)

- LIB= $(TOOLSC6X)/cgtools/lib/rts64plus.lib
+ LIB= $(TOOLSC6X)/lib/rts64plus.lib

  OPT=
  C2B_OPT=
 else
  OPT=
  C2B_OPT=
 else

- LIB= $(TOOLSC6X)/cgtools/lib/rts64pluse.lib
+ LIB= $(TOOLSC6X)/lib/rts64pluse.lib

  OPT= -me
  C2B_OPT= -swap
 endif
  OPT= -me
  C2B_OPT= -swap
 endif

diff --git a/src/util/i2cConfig/Makefile b/src/util/i2cConfig/Makefile
index c1e2d6e423437a20582dc0b676119e07e1a69f23..e44d0154a30ab30b06fe75227046e3273d419871 100644 (file)
--- a/src/util/i2cConfig/Makefile
+++ b/src/util/i2cConfig/Makefile
@@ -74,7 +74,7 @@ $(DEVICES):
 
 
 clean:
 
 
 clean:

-       make -f makestg2 clean2 ARCH=c64x
+       make -f makestg2 clean2 ARCH=c64x