Debug option added to makefiles

Debug options can be specified by building with DEBUG=yes from
the make invokation.

diff --git a/src/device/c6474/c6474.c b/src/device/c6474/c6474.c
index 868589fdde150f3e9f728844a1d87ae7880d5995..fe2747650f0d48d48ed68d22a86d67a82fc9e727 100644 (file)
--- a/src/device/c6474/c6474.c
+++ b/src/device/c6474/c6474.c
@@ -22,6 +22,7 @@
 extern cregister unsigned int DNUM;
 
 
+#if 0
 /**
  * @brief The default boot configuration table is filled in
  *
@@ -153,6 +154,7 @@ void deviceLoadDefaultIblTable (void)
     
 
 }
+#endif
 
 /**
  *  @brief Determine if an address is local

diff --git a/src/device/c64x/make/makefile b/src/device/c64x/make/makefile
index ffcf4ac5f59d301d2f2deb1730ba5fda546c455b..b4c23c91ff029780b1ad24e0c2faee551496a72d 100644 (file)
--- a/src/device/c64x/make/makefile
+++ b/src/device/c64x/make/makefile
@@ -56,7 +56,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) > cdefdep.tmp
+       @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 '
 
 

diff --git a/src/driver/c64x/make/makefile b/src/driver/c64x/make/makefile
index 3d8bb70a4f03299bbb44c8a0ce63840796afc995..2200916e29056e668ef393b6ef56c46658c8e0c0 100644 (file)
--- a/src/driver/c64x/make/makefile
+++ b/src/driver/c64x/make/makefile
@@ -61,7 +61,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(CDEFS) > cdefdep.tmp
+       @echo $(ENDIAN) $(TARGET) $(CDEFS) $(DEBUG) > cdefdep.tmp
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 
 

diff --git a/src/ecc/c64x/make/makefile b/src/ecc/c64x/make/makefile
index 47847bfca232f218b2ab7e970a9065c32d17df22..f24887bbe62086c449dba4385dfb9250c758d678 100644 (file)
--- a/src/ecc/c64x/make/makefile
+++ b/src/ecc/c64x/make/makefile
@@ -36,7 +36,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(CDEFS) > cdefdep.tmp
+       @echo $(ENDIAN) $(TARGET) $(CDEFS) $(DEBUG) > cdefdep.tmp
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 
 

diff --git a/src/ethboot/c64x/make/makefile b/src/ethboot/c64x/make/makefile
index 895d51a9147efbca6ac1fddabc642bfee2a8601d..9d51e8fa976085258c6039103f977450593bb295 100644 (file)
--- a/src/ethboot/c64x/make/makefile
+++ b/src/ethboot/c64x/make/makefile
@@ -41,7 +41,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(CDEFS) > cdefdep.tmp
+       @echo $(ENDIAN) $(TARGET) $(CDEFS) $(DEBUG) > cdefdep.tmp
        @sh -c 'if diff -q cdefdep.tmp cdefdep ; then echo same ; else $(CP) cdefdep.tmp cdefdep ; fi '
 
 

diff --git a/src/hw/c64x/make/makefile b/src/hw/c64x/make/makefile
index e3ceca0c301e362b21c98085856e37ce306e86cb..a69e177637cd4308cf617aeb9e152b9845071445 100644 (file)
--- a/src/hw/c64x/make/makefile
+++ b/src/hw/c64x/make/makefile
@@ -99,7 +99,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) > cdefdep.tmp
+       @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 '
 
 

diff --git a/src/interp/c64x/make/makefile b/src/interp/c64x/make/makefile
index 273366e81442d4e6612d83037294700fadbbb300..946787a3c2c03aa1ebff4bdd1ff6ace8e729cf66 100644 (file)
--- a/src/interp/c64x/make/makefile
+++ b/src/interp/c64x/make/makefile
@@ -58,7 +58,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) > cdefdep.tmp
+       @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 '
 
 

diff --git a/src/main/c64x/make/makefile b/src/main/c64x/make/makefile
index 15a6980f79bbd6189b2fdba9179ab48bcc57de0a..9a73485fec75d9c2827446fe5b946eddbdf7d4b2 100644 (file)
--- a/src/main/c64x/make/makefile
+++ b/src/main/c64x/make/makefile
@@ -64,6 +64,6 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(CDEFS) > cdefdep.tmp
+       @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 '
 

diff --git a/src/make/Makefile b/src/make/Makefile
index 31dc4d8080d4eeb01472b5f4f4ff306003ed2991..68d623cc245f8f37e137667b359fa32ae30e542f 100644 (file)
--- a/src/make/Makefile
+++ b/src/make/Makefile
@@ -20,9 +20,15 @@ ifndef ENDIAN
 endif
 export ENDIAN
 
+# The debug flag changes compiler options
+ifndef DEBUG
+ DEBUG=no
+endif
+export DEBUG
+
 # The value of I2C_PARAM_BUS_ADDR determines the I2C bus address used
 # to read the ibl configuration table from. The default values are
-# 0x50 for little endian and 0x51 for big endian
+# 0x50 for little endian and 0x51 for big endian.
 
 ifndef I2C_PARAM_BUS_ADDR
  ifeq ($(ENDIAN),little)

diff --git a/src/make/c64x/makedefs.mk b/src/make/c64x/makedefs.mk
index 5c98b6e30a9ffe8021ae16b7901a9907f6a30376..dfe3c6693daccbafe02273556d5fd35cc38a1a9d 100644 (file)
--- a/src/make/c64x/makedefs.mk
+++ b/src/make/c64x/makedefs.mk
@@ -66,9 +66,15 @@ RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
 # -pds824: shut off #pragma symbol warnings (can be applied to file level symbol only)
 # -pds837: shut off #pragma symbol warnings (can be applied to file level symbol only)
 # -pds97:  shut off no source in file warning
-#CFLAGS  = -c -k -mi200 -ml3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
-#CFLAGS  = -c -k -mi200 -ml3 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
-CFLAGS  = -c -k -mi200 -ml0 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
+ifneq ($(UTIL),yes)
+ ifeq ($(DEBUG),yes)
+  CFLAGS  = -c -k -mi200 -ml3 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
+ else
+  CFLAGS  = -c -k -mi200 -ml0 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
+ endif
+else
+ CFLAGS  = -c -k -mi200 -ml3 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
+endif
 
 ifeq ($(ENDIAN),big)
  CFLAGS+= -me
@@ -78,9 +84,15 @@ endif
 # -as : keep local symbols
 # -g  : enable debugging
 # -ss : interlist C source and optimizer with .asm source
-#DCFLAGS = -g -as  -ss
-DCFLAGS = -as  -ss
-#DCFLAGS = -gp
+ifneq ($(UTIL),yes)
+ ifeq ($(DEBUG),yes)
+  DCFLAGS = -g -as  -ss
+ else
+  DCFLAGS = -as  -ss
+ endif
+else
+ DCFLAGS = -g -as  -ss
+endif
 
 
 # ASM options

diff --git a/src/make/ibl_c6474/i2crom_be.map b/src/make/ibl_c6474/i2crom_be.map
index 5e9f422882c48dcad0fa3a9857346d29777f2e2b..9edb5f110a30074fb6db4445a26266093107824a 100644 (file)
--- a/src/make/ibl_c6474/i2crom_be.map
+++ b/src/make/ibl_c6474/i2crom_be.map
@@ -1,6 +1,6 @@
 section 
 {
-  param_index   = 0
+  param_index   = 1
   boot_mode     = 257
   sw_pll               = 20
   options       = 1

diff --git a/src/make/ibl_c6474/i2crom_le.map b/src/make/ibl_c6474/i2crom_le.map
index 7551855ff2e7f1b2dd2b90fdb8ba864515ac6c82..b67b6cf730b1cb7dcaab8174a067b1054b2e2c3d 100644 (file)
--- a/src/make/ibl_c6474/i2crom_le.map
+++ b/src/make/ibl_c6474/i2crom_le.map
@@ -1,6 +1,6 @@
 section 
 {
-  param_index   = 0
+  param_index   = 1
   boot_mode     = 257
   sw_pll               = 20
   options       = 1

diff --git a/src/nandboot/c64x/make/makefile b/src/nandboot/c64x/make/makefile
index 2f36e1187fd7ad449ab2cf1e80d92d183c4c0a12..b55420246aa61c904fd93ebdaf250e1007feef62 100644 (file)
--- a/src/nandboot/c64x/make/makefile
+++ b/src/nandboot/c64x/make/makefile
@@ -38,7 +38,7 @@ $(OBJS): cdefdep
 
 gen_cdefdep:
        @echo Checking command line dependencies
-       @echo $(ENDIAN) $(TARGET) $(CDEFS) > cdefdep.tmp
+       @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 '
 
 

diff --git a/src/util/i2cConfig/i2cConfig.gel b/src/util/i2cConfig/i2cConfig.gel
index a7a0b4e73da25f15b6aaeb0b904f3aca4d4baded..3cbe2ef163ab960d0760d0216dea8e6834fadcd3 100644 (file)
--- a/src/util/i2cConfig/i2cConfig.gel
+++ b/src/util/i2cConfig/i2cConfig.gel
@@ -202,9 +202,9 @@ hotmenu setConfig_c6474()
     ibl.ethConfig[0].useBootpFileName = FALSE;\r
     ibl.ethConfig[0].bootFormat       = ibl_BOOT_FORMAT_BBLOB;\r
 \r
-    SETIP(ibl.ethConfig[0].ethInfo.ipAddr,    158,218,100,114);\r
-    SETIP(ibl.ethConfig[0].ethInfo.serverIp,  158,218,100,25);\r
-    SETIP(ibl.ethConfig[0].ethInfo.gatewayIp, 158,218,100,2);\r
+    SETIP(ibl.ethConfig[0].ethInfo.ipAddr,    10,218,109,35);\r
+    SETIP(ibl.ethConfig[0].ethInfo.serverIp,  10,218,109,196);\r
+    SETIP(ibl.ethConfig[0].ethInfo.gatewayIp, 10,218,109,1);\r
     SETIP(ibl.ethConfig[0].ethInfo.netmask,   255,255,255,0);\r
 \r
     /* Set the hardware address as 0 so the e-fuse value will be used */\r
@@ -216,18 +216,18 @@ hotmenu setConfig_c6474()
     ibl.ethConfig[0].ethInfo.hwAddress[5] = 0;\r
 \r
 \r
-    ibl.ethConfig[0].ethInfo.fileName[0]  = 'c';\r
-    ibl.ethConfig[0].ethInfo.fileName[1]  = '6';\r
-    ibl.ethConfig[0].ethInfo.fileName[2]  = '4';\r
-    ibl.ethConfig[0].ethInfo.fileName[3]  = '7';\r
-    ibl.ethConfig[0].ethInfo.fileName[4]  = '4';\r
-    ibl.ethConfig[0].ethInfo.fileName[5]  = '-';\r
+    ibl.ethConfig[0].ethInfo.fileName[0]  = 't';\r
+    ibl.ethConfig[0].ethInfo.fileName[1]  = 'e';\r
+    ibl.ethConfig[0].ethInfo.fileName[2]  = 's';\r
+    ibl.ethConfig[0].ethInfo.fileName[3]  = 't';\r
+    ibl.ethConfig[0].ethInfo.fileName[4]  = '.';\r
+    ibl.ethConfig[0].ethInfo.fileName[5]  = 'b';\r
     ibl.ethConfig[0].ethInfo.fileName[6]  = 'l';\r
-    ibl.ethConfig[0].ethInfo.fileName[7]  = 'e';\r
-    ibl.ethConfig[0].ethInfo.fileName[8]  = '.';\r
-    ibl.ethConfig[0].ethInfo.fileName[9]  = 'b';\r
-    ibl.ethConfig[0].ethInfo.fileName[10] = 'i';\r
-    ibl.ethConfig[0].ethInfo.fileName[11] = 'n';\r
+    ibl.ethConfig[0].ethInfo.fileName[7]  = 'o';\r
+    ibl.ethConfig[0].ethInfo.fileName[8]  = 'b';\r
+    ibl.ethConfig[0].ethInfo.fileName[9]  = '\0';\r
+    ibl.ethConfig[0].ethInfo.fileName[10] = '\0';\r
+    ibl.ethConfig[0].ethInfo.fileName[11] = '\0';\r
     ibl.ethConfig[0].ethInfo.fileName[12] = '\0';\r
     ibl.ethConfig[0].ethInfo.fileName[13] = '\0';\r
     ibl.ethConfig[0].ethInfo.fileName[14] = '\0';\r

diff --git a/src/util/i2cConfig/makestg2 b/src/util/i2cConfig/makestg2
index 67219e7f3316d43350a3650836e1e5e1b04fd8c0..13d63f56aca71458c188a89ebafe67d25776fbdf 100644 (file)
--- a/src/util/i2cConfig/makestg2
+++ b/src/util/i2cConfig/makestg2
@@ -21,6 +21,10 @@ CLEAN_MODULES=$(addprefix clean_,$(MODULES))
 
 CSRC= i2cparam.c
 
+
+# enable debug info in the compile
+UTIL=yes
+
 include $(IBL_ROOT)/make/$(ARCH)/makeeco.mk
 
 C6X_C_DIR=  $(IBL_ROOT)

diff --git a/src/util/i2cRead/makestg2 b/src/util/i2cRead/makestg2
index 88e65b894e5ddf74fecd1ad254d333cda11e5ab2..d84ad0d1c66cc09cf5bcd3589ef59ce865a0221c 100644 (file)
--- a/src/util/i2cRead/makestg2
+++ b/src/util/i2cRead/makestg2
@@ -21,6 +21,9 @@ CLEAN_MODULES=$(addprefix clean_,$(MODULES))
 
 CSRC= i2cRead.c
 
+# enable debug info in the compile
+UTIL=yes
+
 include $(IBL_ROOT)/make/$(ARCH)/makeeco.mk
 
 C6X_C_DIR=   $(IBL_ROOT)/hw/i2c

diff --git a/src/util/i2cWrite/makestg2 b/src/util/i2cWrite/makestg2
index 575d990dc9d8b9f4a23e8d06c713d378df01d616..3b17af92c15e5d90d28df956dfb3ef8d7d55b67f 100644 (file)
--- a/src/util/i2cWrite/makestg2
+++ b/src/util/i2cWrite/makestg2
@@ -21,6 +21,9 @@ CLEAN_MODULES=$(addprefix clean_,$(MODULES))
 
 CSRC= i2cWrite.c
 
+# enable debug info in the compile
+UTIL=yes
+
 include $(IBL_ROOT)/make/$(ARCH)/makeeco.mk
 
 C6X_C_DIR=   $(IBL_ROOT)/hw/i2c