Make file cleanup

diff --git a/setenv b/setenv
deleted file mode 100644 (file)
index 0f66b9c..0000000
--- a/setenv
+++ /dev/null
@@ -1,12 +0,0 @@
-export OS=Linux
-export C6X_BASE_DIR=/opt/CCSv4/ccsv4/tools/compiler/c6000
-export C6X_C_DIR="$C6X_BASE_DIR/include;$C6X_BASE_DIR/lib;"
-export C_DIR="$C6X_C_DIR"
-
-PATH=$C6X_BASE_DIR/bin:$PATH
-
-
-export TOOLSC6X=$C6X_BASE_DIR
-export TOOLSC6XDOS=$TOOLSC6X
-export TOOLSBIOSC6XDOS=$TOOLSC6X
-

diff --git a/setupenvLnx.sh b/setupenvLnx.sh
deleted file mode 100755 (executable)
index 531979f..0000000
--- a/setupenvLnx.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-export OS="Linux"
-export C6X_BASE_DIR="/sim/scratch_a0216561/opt/TI_CGT_C6000_7.2.0A10218"
-export PATH="$C6X_BASE_DIR/bin:$PATH"
-export TOOLSC6X="/sim/scratch_a0216561/opt/TI_CGT_C6000_7.2.0A10218"
-export TOOLSC6XDOS="/sim/scratch_a0216561/opt/TI_CGT_C6000_7.2.0A10218"
-export TOOLSBIOSC6XDOS="/sim/scratch_a0216561/opt/TI_CGT_C6000_7.2.0A10218"

diff --git a/src/driver/c64x/make/makefile b/src/driver/c64x/make/makefile
index e9d2ae460cbe35c6d91b6bfdf0579d2e7bed1fe4..76f2a4d25d9f88682369496c31fa97adfebef04c 100644 (file)
--- a/src/driver/c64x/make/makefile
+++ b/src/driver/c64x/make/makefile
@@ -91,8 +91,11 @@ C6X_C_DIR+= ;$(IBL_ROOT)/device
 C6X_C_DIR+= ;$(IBL_ROOT)/device/$(TARGET)
 export C6X_C_DIR
 
-vpath % $(subst ;,$(PATHSEP), $(ECODIR)/$(ETHDIR); $(ECODIR)/$(STRMDIR); $(ECODIR)/$(TIMDIR); $(ECODIR)/$(NANDDIR); $(ECODIR)/$(NORDIR) )
-
+vpath % $(ECODIR)/$(ETHDIR)
+vpath % $(ECODIR)/$(STRMDIR)
+vpath % $(ECODIR)/$(TIMDIR)
+vpath % $(ECODIR)/$(NANDDIR)
+vpath % $(ECODIR)/$(NORDIR)
 
 driver: gen_cdefdep makefile $(OBJS)
 
@@ -105,7 +108,3 @@ gen_cdefdep:
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 
 
-
-
-
-

diff --git a/src/make/Makefile b/src/make/Makefile
index daef86fc774e62a1e9dbc75e64a0328b26ca0921..c9d30099d3f31444aa859ed4a4c44f782fd8fe35 100644 (file)
--- a/src/make/Makefile
+++ b/src/make/Makefile
@@ -314,51 +314,51 @@ evm_c6678_i2c:
        make -f makestg1 I2C_BUS_ADDR=$(I2C_BUS_ADDR) I2C_MAP_ADDR=$(I2C_MAP_ADDR) ENDIAN_MODE=$(ENDIAN) ARCH=c64x TARGET=c661x SPI=no SPI_DEFS='$(EVM_6608_SPI_DEFS)' c661x
 
 test_c661x:
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
-       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='SPI NOR_SPI NAND_SPI' I2C_BUS_ADDR=0x50 COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
+       make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='SPI NOR_SPI NAND_SPI' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
        make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES=I2C SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' c661x
 
 # Test - builds all the targets, with single component exclusion
 
 test_c6455:
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=          c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ETH       c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BIS       c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=COFF      c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ELF       c6455
-       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BLOB      c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=          c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ETH       c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BIS       c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=COFF      c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ELF       c6455
+       make -f makestg1 ARCH=c64x TARGET=c6455 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BLOB      c6455
 
 test_c6457:
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=          c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ETH       c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BIS       c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=COFF      c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ELF       c6457
-       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BLOB      c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=          c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ETH       c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BIS       c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=COFF      c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ELF       c6457
+       make -f makestg1 ARCH=c64x TARGET=c6457 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BLOB      c6457
 
 test_c6472:
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=          c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ETH       c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BIS       c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=COFF      c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ELF       c6472
-       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BLOB      c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=          c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ETH       c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BIS       c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=COFF      c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=ELF       c6472
+       make -f makestg1 ARCH=c64x TARGET=c6472 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no ENDIAN_MODE=both CEXCLUDES=BLOB      c6472
 
 test_c6474:
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=          c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ETH       c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BIS       c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=COFF      c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ELF       c6474
-       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BLOB      c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=          c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ETH       c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=NAND_GPIO c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BIS       c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=COFF      c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=ELF       c6474
+       make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BLOB      c6474
 
 
 test_build: test_c6455 test_c6457 test_c6472 test_c6474 test_c661x

diff --git a/src/make/c64x/makedefs.mk b/src/make/c64x/makedefs.mk
index 7b5efb38bfde5e7b8490e26aabaedc5baf8029d9..4076feb3642236bb058219109b2c2b4de3c899d2 100644 (file)
--- a/src/make/c64x/makedefs.mk
+++ b/src/make/c64x/makedefs.mk
@@ -42,7 +42,8 @@ ifeq ($(OS),Linux)
     DIRSEP=/
     PATHSEP=:
 else
-    DIRSEP=$(subst /,\,/)
+#DIRSEP=$(subst /,\,/)
+    DIRSEP=/
     PATHSEP=;
 endif
 
@@ -56,7 +57,8 @@ else
   ALLFARLIB       = $(TOOLSC6XDOS)/lib/rts64plus.lib
 endif
 
-RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
+#RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
+RTLIBS     = $(subst \,/,$(ALLFARLIB))
 
 # Common compilation flags
 # -c     : disable linker

diff --git a/src/make/makestg2 b/src/make/makestg2
index d650fc58c11fb9679db951144fadfb2f24e81e7e..2b3b4bf1ef3454b90b1a26dd8a489d5b1abf05eb 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
@@ -64,6 +64,16 @@ else
     HAS_SPI=0
 endif
 
+ifeq (EXCLUDE_SPI, $(strip $(findstring EXCLUDE_SPI, $(MAINDEFS))))
+    HAS_SPI=0
+endif
+
+ifeq (EXCLUDE_I2C, $(strip $(findstring EXCLUDE_I2C, $(MAINDEFS))))
+    HAS_I2C=0
+else 
+   HAS_I2C=1
+endif
+
 # The I2C creation options. The I2C map file is run through the C pre-processor to generate
 # the desired I2C mapping. There are three possible configurations - an i2c which has
 # both endians present, or an I2C with only one of the endians
@@ -199,9 +209,11 @@ ifeq ($(HAS_SPI),1)
 endif
        make -C $(IBL_ROOT)/util/btoccs
        make -C $(IBL_ROOT)/util/romparse TARGET=$(TARGET)
+ifeq ($(HAS_I2C),1)
        make -C $(IBL_ROOT)/util/i2cRead  TARGET=$(TARGET) $(TARGET) 
        make -C $(IBL_ROOT)/util/i2cWrite TARGET=$(TARGET) I2C_SIZE_BYTES=$(I2C_SIZE_BYTES) MAINDEFS='$(MAINDEFS) $(SPI_CFG)' $(TARGET)
        make -C $(IBL_ROOT)/util/i2cConfig $(TARGET) MAINDEFS='$(MAINDEFS) $(SPI_CFG)' 
+endif
        make -C $(IBL_ROOT)/util/bconvert
 
 clean: $(CLEAN_MODULES) hwClean
@@ -248,6 +260,8 @@ cleant:
        rm -rf ibl_$(TARGET)/ibl_objs.inc
        rm -rf ibl_$(TARGET)/ibl_objs.pp
        rm -rf ibl_$(TARGET)/ibl_objs.tmp
+       rm -rf ibl_$(TARGET)/spiRom.dat
+       rm -rf ibl_$(TARGET)/spiRom.map.pp
        
 
 

diff --git a/src/make/setupenv.bat b/src/make/setupenv.bat
index 7d64a43737c8e8ce07e132396ea07cfa9e5933e8..ed71b44e138ac2945668e2f4542035909b3ca6b1 100644 (file)
--- a/src/make/setupenv.bat
+++ b/src/make/setupenv.bat
@@ -1,110 +1,40 @@
-@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
-
-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:\PROGRA~1\TEXASI~1\C6000C~.2.0\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 BISONSKEL=t:\gen\gnu\99-11-01\cygwin-b20\share\bison.simple
-set TOOLSC6X=C:/PROGRA~1/TEXASI~1/C6000C~.2.0
-set TOOLSC6XDOS=C:\PROGRA~1\TEXASI~1\C6000C~.2.0
-
-set TOOLC6XSRC=t:\c6xx\cgen_7_2_0\c6000\cgtools
-set TOOLC6XDST=C:\PROGRA~1\TEXASI~1\C6000C~.2.0
-
-
-rem ************************* Tools Copy/Validation **************************
-rem If the "bypass" option is not provided, validate/copy the tools
-rem *********************************************************************
-if "%1" == "bypass" goto environment
-
-rem check, but don't copy tools
-if "%1" == "" goto toolcheck
-
-rem copy tools if check fails
-if "%1" == "enable_write" goto toolcopy
-
-rem error: invalid argument
-echo =========================== INVALID ARGUMENT ============================
-echo Option "%1" is invalid.  Valid options are:
-echo "bypass":       configure environment without checking tools
-echo "enable_write": *****ERASE***** all files in %TOOLDST%, 
-echo                 and replace with correct tools
-echo =========================== INVALID ARGUMENT ============================
-goto end
-
-:toolcheck
-echo Verifying local tools
-goto toolperl
-
-:toolcopy
-echo UPDATING local tools
-:toolperl
-%PERLDOS% cpytools\cpytools.pl %TOOLC6XSRC% %TOOLC6XDST% %1
-rem note: windows is stupid; "errorlevel 1" means "retval >= 1"
-if errorlevel 1 goto error
-
-echo Local tools are good
-goto environment
-
-
-rem ************************** Bad Tools *************************************
-rem Tools are bad; deconfigure environment and print error
-rem **************************************************************************
-:error
-set TOOLS=
-set TOOLSDOS=
-
-echo ============================== BAD TOOLS =================================
-echo * Build environment is NOT configured.  You may rerun script with:
-echo *
-echo * %0 bypass       
-echo *    configure environment without checking tools.  This option is
-echo *    is used when the user will manually configure the tools.
-echo *
-echo * %0 enable_write 
-echo *    [*** DANGEROUS OPTION ***]
-echo *    This option 
-echo *        1) *** DANGER *** Recursively deletes all files in subdirectories
-echo *           %DST365% and %TOOLDST%
-echo *        2) Copies correct tools from the subdirectories
-echo *           %SRC365% and %TOOLSRC%
-echo *               
-echo ============================== BAD TOOLS =================================
-
-:environment
-:end
-
+@REM ******************************************************************************\r
+@REM * FILE PURPOSE: Environment Setup for building Bootloader\r
+@REM ******************************************************************************\r
+@REM * FILE NAME: setupenv.bat\r
+@REM *\r
+@REM * DESCRIPTION: \r
+@REM *  Configures and sets up the Build Environment for Bootloader in DOS environment. \r
+@REM *  \r
+@REM *  Customers are expected to modify this file as per their build environment.\r
+@REM *\r
+@REM * USAGE:\r
+@REM *  setupenv.bat  \r
+@REM *              :bypass       \r
+@REM *                  configure environment without checking tools.  This option is\r
+@REM *                  is used when the user will manually configure the tools.\r
+@REM *  \r
+@REM *              :enable_write \r
+@REM *      [*** DANGEROUS OPTION ***]\r
+@REM *                  Updates the tool in local drive  \r
+@REM *               \r
+@REM *              :No arguments: Sets the environment for building, Verifies local\r
+@REM *               tools and reports if any tool update is required   \r
+@REM *\r
+@REM * Copyright (C) 2010, Texas Instruments, Inc.\r
+@REM *****************************************************************************\r
+\r
+@echo off\r
+\r
+REM  Setup the ibl build environment\r
+\r
+REM Modify following lines based on target environment for the toolset installed \r
+REM Dependency is related to path for Cygwin and CGEN installed\r
+\r
+set PATH=G:\cygwin\bin;G:/PROGRA~1/TEXASI~1\ccsv5\tools\compiler\c6000\bin\r
+set PATH=%PATH%;%SystemRoot%\system32;%SystemRoot%;\r
+set CYGWINPATH=G:/cygwin/bin\r
+set BISONSKEL=yacc.c\r
+set TOOLSC6X=G:/PROGRA~1/TEXASI~1/ccsv5/tools/compiler/c6000\r
+set TOOLSC6XDOS=G:\PROGRA~1\TEXASI~1\ccsv5\tools\compiler\c6000\r
+\r

diff --git a/src/util/bconvert/makefile b/src/util/bconvert/makefile
index 2a50443c16863df0ec9177985b5fdbca240632ab..fca4cc82fd4867e19dfa1727ce16a60268c8458e 100644 (file)
--- a/src/util/bconvert/makefile
+++ b/src/util/bconvert/makefile
@@ -45,7 +45,7 @@ bconvert64x: bconvert64x.c
 
 
 clean:
-       rm -rf bconvert.exe bconvert64x.exe
+       rm -rf bconvert bconvert64x
 
 
 

diff --git a/src/util/btoccs/Makefile b/src/util/btoccs/Makefile
index af738b9aafa59e47b6c07a7300173055264f7d8d..7aa9bf989fef0c28b4396008f8c7d3b8c8206a46 100644 (file)
--- a/src/util/btoccs/Makefile
+++ b/src/util/btoccs/Makefile
@@ -57,4 +57,4 @@ ccs2bin.exe: ccs2bin.c
 
 
 clean:
-       -rm -f b2ccs.exe b2i2c.exe ccs2b.exe bfaddsect.exe bfmerge.exe ccs2bin.exe
+       -rm -f b2ccs.exe b2i2c.exe ccs2b.exe bfaddsect.exe bfmerge.exe ccs2bin.exe ccs2bin

diff --git a/src/util/romparse/Makefile b/src/util/romparse/Makefile
index 869a19f68d2e563dee62a7f4721da3b8211be285..0a8644d61018a110614e17d00e442819dce544c8 100644 (file)
--- a/src/util/romparse/Makefile
+++ b/src/util/romparse/Makefile
@@ -54,7 +54,7 @@ lex.yy.o: rparse.flex
 
 
 clean:
-       rm -f romparse.exe rparse.tab.o lex.yy.o lex.yy.c rparse.tab.c rparse.tab.h
+       rm -f romparse rparse.tab.o lex.yy.o lex.yy.c rparse.tab.c rparse.tab.h
 
 gen_cdefdep:
        @echo Checking command line dependencies