author | Mike Line <m-line1@ti.com> | |
Fri, 19 Nov 2010 22:12:03 +0000 (17:12 -0500) | ||
committer | Mike Line <m-line1@ti.com> | |
Fri, 19 Nov 2010 22:12:03 +0000 (17:12 -0500) |
Conflicts:
src/cfg/c6474/iblcfg.h
src/driver/eth/arp.pretimer.c
src/make/c64x/makedefs.mk
src/cfg/c6474/iblcfg.h
src/driver/eth/arp.pretimer.c
src/make/c64x/makedefs.mk
50 files changed:
diff --cc src/cfg/c6455/iblcfg.h
Simple merge
diff --cc src/cfg/c6472/iblcfg.h
Simple merge
diff --cc src/cfg/c6474/iblcfg.h
index 9afdfd11befcb34f2725257f5c37cb5ece1a9af5,2a9a6dcb34ad19e6cd60dd0b21b8dfd77825d55c..8961085368eb9ff590282c12f345a4f3e357a84f
mode 100755,100644..100755
mode 100755,100644..100755
+++ b/src/cfg/c6474/iblcfg.h
#define IBL_I2C_OWN_ADDR 10
#define IBL_I2C_CFG_ADDR_DELAY 0x100 /* Delay between sending the address and reading data */
- #ifdef IBL_I2C_CFG_EEPROM_BUS_ADDR
- #undef IBL_I2C_CFG_EEPROM_BUS_ADDR
+ /**
+ * @brief The default location for the i2c map information can be overridden during make
+ */
+ #ifndef IBL_I2C_MAP_TABLE_DATA_BUS_ADDR
+ #define IBL_I2C_MAP_TABLE_DATA_BUS_ADDR 0x50
#endif
- #define IBL_I2C_CFG_EEPROM_BUS_ADDR 0x50
-
--
- #define IBL_I2C_CFG_TABLE_DATA_ADDR (0x8000 - 0x300)
+ #ifndef IBL_I2C_MAP_TABLE_DATA_ADDR
+ #define IBL_I2C_MAP_TABLE_DATA_ADDR 0x100
+ #endif
diff --cc src/device/c6455/c6455.c
Simple merge
diff --cc src/device/c6472/c6472.c
Simple merge
diff --cc src/device/c6474/c6474.c
Simple merge
diff --cc src/device/c64x/make/makefile
Simple merge
diff --cc src/device/device.h
Simple merge
diff --cc src/driver/c64x/make/makefile
Simple merge
diff --cc src/driver/eth/arp.c
Simple merge
diff --cc src/driver/eth/bootp.c
Simple merge
diff --cc src/driver/eth/icmp.c
index 6ff357726952af03accf06faca85614f0312ea85,07bc61954978a830b412f8c8bdc40dbc2f478411..84a368d10281c4df7a00fbc5c22b27337b759582
+++ b/src/driver/eth/icmp.c
* \par
* NOTE:
* (C) Copyright 2008, Texas Instruments, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of Texas Instruments Incorporated nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* \par
- */
+*/
#include <blf.h>
#include "netif.h"
+ #include "net_osal.h"
#ifdef INCLUDE_BLF_NET_MODULE
#ifdef INCLUDE_BLF_NET_ICMP
diff --cc src/driver/eth/ip.c
Simple merge
diff --cc src/driver/eth/net.c
Simple merge
diff --cc src/driver/eth/tftp.c
Simple merge
diff --cc src/driver/eth/udp.c
Simple merge
diff --cc src/driver/nand/nand.c
Simple merge
diff --cc src/driver/stream/stream.c
Simple merge
diff --cc src/driver/timer/timer.c
Simple merge
diff --cc src/ecc/c64x/make/makefile
Simple merge
diff --cc src/ethboot/c64x/make/makefile
Simple merge
diff --cc src/ethboot/ethboot.c
Simple merge
diff --cc src/hw/c64x/make/makefile
index 46c6e51d69e6d812e5548f64c983974b06e246d2,e7d9a7d36cd944ae4c4236ddf87636b6eb6a07b9..aefdb32b60238dff59a986058b7cd7c1f7da3638
gen_cdefdep:
@echo Checking command line dependencies
- @echo $(ENDIAN) $(TARGET) $(ARCH) $(CDEFS) $(DEBUG) > cdefdep.tmp
+ @echo $(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 --cc src/hw/macs/cpmac/cpmacdrv.c
Simple merge
diff --cc src/hw/plls/pllapi.h
Simple merge
diff --cc src/hw/plls/pllxx1p8/pll.c
Simple merge
diff --cc src/ibl.h
Simple merge
diff --cc src/iblloc.h
Simple merge
diff --cc src/interp/btbl/btblwrap.c
Simple merge
diff --cc src/interp/btbl/btblwrap.h
Simple merge
diff --cc src/interp/c64x/make/makefile
Simple merge
diff --cc src/interp/coff/osal.h
Simple merge
diff --cc src/interp/elf/ArrayList.c
Simple merge
diff --cc src/interp/elf/dlw_client.c
Simple merge
diff --cc src/interp/elf/file_ovr.h
Simple merge
diff --cc src/main/c64x/make/makefile
Simple merge
diff --cc src/main/iblmain.c
Simple merge
diff --cc src/make/Makefile
Simple merge
diff --cc src/make/c64x/makedefs.mk
Simple merge
diff --cc src/make/makestg2
Simple merge
diff --cc src/nandboot/c64x/make/makefile
Simple merge
diff --cc src/util/i2cConfig/Makefile
Simple merge
diff --cc src/util/i2cConfig/i2cConfig.gel
index f3cf345984cb81f2dfdbf065f3511088c67b0da1,48c64004b6eb79d886549f85db35f30743e65cc3..7b21f81dd3058a3570d8925aa0888d9603bad630
mode 100755,100644..100755
mode 100755,100644..100755
diff --cc src/util/i2cConfig/i2cparam.c
Simple merge
diff --cc src/util/i2cWrite/i2cWrite.c
Simple merge
diff --cc src/util/romparse/Makefile
Simple merge
diff --cc src/util/romparse/romparse.c
Simple merge
diff --cc src/util/romparse/romparse.h
Simple merge
diff --cc src/util/romparse/rparse.tab.c
index d6d9f9225a2590b7e552640a791edd57ad17dfb5,dc2ca6c82a02525b58e808daf52eee0e6648467c..bd4ef877582d17c81ab26eff7a6ab4a159672b96
};
- #define YYLAST 52
+ #define YYLAST 106
- static const short yytable[] = { 26,
- 29, 30, 5, 6, 8, 9, 10, 11, 12, 13,
- 14, 15, 25, 16, 17, 18, 19, 20, 21, 31,
- 1, 32, 28, 7, 1, 27, 0, 0, 0, 0,
- 0, 0, 2, 0, 0, 0, 2, 8, 9, 10,
- 11, 12, 13, 14, 15, 0, 16, 17, 18, 19,
- 20, 21
+ static const short yytable[] = { 45,
+ 10, 1, 39, 12, 1, 13, 39, 39, 43, 44,
+ 36, 37, 11, 2, 40, 35, 2, 14, 46, 0,
+ 3, 38, 4, 3, 0, 4, 15, 16, 17, 18,
+ 19, 20, 21, 22, 0, 23, 24, 25, 26, 27,
+ 28, 41, 29, 0, 30, 31, 15, 16, 17, 18,
+ 19, 20, 21, 22, 0, 23, 24, 25, 26, 27,
+ 28, 42, 29, 0, 30, 31, 15, 16, 17, 18,
+ 19, 20, 21, 22, 0, 23, 24, 25, 26, 27,
+ 28, 0, 29, 0, 30, 31, 15, 16, 17, 18,
+ 19, 20, 21, 22, 0, 23, 24, 25, 26, 27,
+ 28, 0, 29, 0, 30, 31
};
- static const short yycheck[] = { 4,
- 7, 8, 3, 6, 9, 10, 11, 12, 13, 14,
- 15, 16, 8, 18, 19, 20, 21, 22, 23, 0,
- 5, 0, 6, 3, 5, 22, -1, -1, -1, -1,
- -1, -1, 17, -1, -1, -1, 17, 9, 10, 11,
- 12, 13, 14, 15, 16, -1, 18, 19, 20, 21,
- 22, 23
+ static const short yycheck[] = { 0,
+ 3, 5, 32, 3, 5, 3, 36, 37, 7, 8,
+ 12, 13, 6, 17, 6, 8, 17, 5, 0, -1,
+ 24, 4, 26, 24, -1, 26, 9, 10, 11, 12,
+ 13, 14, 15, 16, -1, 18, 19, 20, 21, 22,
+ 23, 4, 25, -1, 27, 28, 9, 10, 11, 12,
+ 13, 14, 15, 16, -1, 18, 19, 20, 21, 22,
+ 23, 4, 25, -1, 27, 28, 9, 10, 11, 12,
+ 13, 14, 15, 16, -1, 18, 19, 20, 21, 22,
+ 23, -1, 25, -1, 27, 28, 9, 10, 11, 12,
+ 13, 14, 15, 16, -1, 18, 19, 20, 21, 22,
+ 23, -1, 25, -1, 27, 28
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "bison.simple"
+#line 3 "/cygnus/cygwin-b20/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
diff --cc src/util/romparse/rparse.tab.h
Simple merge