summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f9d6ad)
raw | patch | inline | side by side (parent: 3f9d6ad)
| author | Mike Line <m-line1@ti.com> | |
| Fri, 19 Nov 2010 23:26:42 +0000 (18:26 -0500) | ||
| committer | Mike Line <m-line1@ti.com> | |
| Fri, 19 Nov 2010 23:26:42 +0000 (18:26 -0500) |
Fixed merge errors, made bison work for windows build, removed
error due to clean target in module hw.
error due to clean target in module hw.
| src/hw/c64x/make/makefile | patch | blob | history | |
| src/make/c64x/makedefs.mk | patch | blob | history | |
| src/make/makestg2 | patch | blob | history | |
| src/make/setupenv.bat | patch | blob | history | |
| src/util/romparse/Makefile | patch | blob | history | |
| src/util/romparse/rparse.tab.c | [deleted file] | patch | blob | history |
| src/util/romparse/rparse.tab.h | [deleted file] | patch | blob | history |
index aefdb32b60238dff59a986058b7cd7c1f7da3638..7c5844235c21128d16ea1a6fd634f280026f828d 100644 (file)
@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:
+cleant:
make -f makestg2 clean2 ARCH=c64x
index 8a181d1a3e47e87bc006479c8cd198dbfc3f2921..7b5efb38bfde5e7b8490e26aabaedc5baf8029d9 100644 (file)
MEXT=le
endif
-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
diff --git a/src/make/makestg2 b/src/make/makestg2
index efbfd6e587e3754eaeb10ed852130bdac67223eb..5061e85da88018d61ddf067ed91ea634258e24d4 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
CFG_MODULES= main device
MODULES= ethboot nandboot driver hw interp ecc
-CLEAN_MODULES=$(addprefix clean_,$(MODULES))
-CLEAN_MODULES+=$(addprefix clean,$(CFG_MODULES))
+# Note that the Hw module is a two stage clean and handled seperately
+CLEAN_MODULES=$(addprefix clean_,$(subst hw,,$(MODULES)))
+CLEAN_MODULES+=$(addprefix clean_,$(CFG_MODULES))
TARGETS= c6472 c6474 c6474l c6455 c6457
make -C $(IBL_ROOT)/util/i2cConfig $(TARGET)
make -C $(IBL_ROOT)/util/bconvert
-clean: $(CLEAN_MODULES)
+clean: $(CLEAN_MODULES) hwClean
$(CLEAN_MODULES):
@echo cleaning $(subst clean_, ,$@)
- make -C $(IBL_ROOT)/$(subst clean_,,$@)/$(ARCH)/make clean ARCH=c64x TARGET=c6472
+ make -C $(IBL_ROOT)/$(subst clean_,,$@)/$(ARCH)/make clean ARCH=c64x TARGET=$(TARGET)
+
+hwClean:
+ @echo cleaning hw
+ make -C $(IBL_ROOT)/hw/$(ARCH)/make cleant ARCH=$(ARCH) TARGET=$(TARGET)
cleant:
rm -rf ibl_$(TARGET)/ibl_$(TARGET).out
diff --git a/src/make/setupenv.bat b/src/make/setupenv.bat
index bf3ad41c89f7db5c1730d711aeb3120d4698d42b..f90b425418b52e5e81acf74dda1c634fd4d857cd 100644 (file)
--- a/src/make/setupenv.bat
+++ b/src/make/setupenv.bat
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~1.12
set TOOLSC6XDOS=C:\PROGRA~1\TEXASI~1\C6000C~1.12
index 6a4af1de15a4bb79144a6576af122c65048e2acb..0542f1e4c960e4a038f9ce7dc2c132cbcf6b0029 100644 (file)
#*
+ifdef BISONSKEL
+ BISONDEFS=-S $(BISONSKEL)
+endif
all: gen_cdefdep romparse
rparse.tab.o: rparse.y
- bison -d rparse.y
+ bison -d $(BISONDEFS) rparse.y
gcc -c rparse.tab.c
lex.yy.o: rparse.flex
diff --git a/src/util/romparse/rparse.tab.c b/src/util/romparse/rparse.tab.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*
- *
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- *
- * 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.
- *
-*/
-
-
-
-
-/* A Bison parser, made from rparse.y
- by GNU Bison version 1.25
- */
-
-#define YYBISON 1 /* Identify Bison output. */
-
-#define LBRACE 258
-#define RBRACE 259
-#define SECTION 260
-#define EQU 261
-#define VALUE 262
-#define STRING 263
-#define BOOT_MODE 264
-#define PARAM_INDEX 265
-#define OPTIONS 266
-#define MULTI_I2C_ID 267
-#define MY_I2C_ID 268
-#define CORE_FREQ_MHZ 269
-#define I2C_CLK_FREQ_KHZ 270
-#define EXE_FILE 271
-#define PCI_PARMS 272
-#define NEXT_DEV_ADDR 273
-#define NEXT_DEV_ADDR_EXT 274
-#define ADDRESS_DELAY 275
-#define SWPLL 276
-#define DEV_ADDR_EXT 277
-#define DEV_ADDR 278
-#define LAYOUT 279
-#define ALIGN 280
-#define PAD 281
-#define LENGTH 282
-#define PAD_FILE_ID 283
-
-#line 2 "rparse.y"
-
-#define YYERROR_VERBOSE
-extern char *yytext;
-#ifndef YYSTYPE
-#define YYSTYPE int
-#endif
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define YYFINAL 46
-#define YYFLAG -32768
-#define YYNTBASE 29
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 283 ? yytranslate[x] : 37)
-
-static const char yytranslate[] = { 0,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = { 0,
- 0, 2, 5, 7, 9, 11, 16, 20, 25, 30,
- 32, 35, 39, 43, 45, 47, 49, 51, 53, 55,
- 57, 59, 61, 63, 65, 67, 69, 71, 73, 75
-};
-
-static const short yyrhs[] = { 30,
- 0, 29, 30, 0, 31, 0, 32, 0, 33, 0,
- 5, 3, 34, 4, 0, 17, 6, 8, 0, 24,
- 3, 34, 4, 0, 26, 3, 34, 4, 0, 35,
- 0, 34, 35, 0, 36, 6, 7, 0, 36, 6,
- 8, 0, 9, 0, 10, 0, 11, 0, 12, 0,
- 13, 0, 14, 0, 15, 0, 16, 0, 18, 0,
- 19, 0, 22, 0, 20, 0, 21, 0, 23, 0,
- 25, 0, 27, 0, 28, 0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
- 12, 13, 16, 17, 18, 21, 23, 27, 31, 36,
- 37, 40, 42, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = { "$","error","$undefined.","LBRACE",
-"RBRACE","SECTION","EQU","VALUE","STRING","BOOT_MODE","PARAM_INDEX","OPTIONS",
-"MULTI_I2C_ID","MY_I2C_ID","CORE_FREQ_MHZ","I2C_CLK_FREQ_KHZ","EXE_FILE","PCI_PARMS",
-"NEXT_DEV_ADDR","NEXT_DEV_ADDR_EXT","ADDRESS_DELAY","SWPLL","DEV_ADDR_EXT","DEV_ADDR",
-"LAYOUT","ALIGN","PAD","LENGTH","PAD_FILE_ID","promspec","segment","bootParams",
-"layout","pad","assigns","assign","keyword", NULL
-};
-#endif
-
-static const short yyr1[] = { 0,
- 29, 29, 30, 30, 30, 31, 31, 32, 33, 34,
- 34, 35, 35, 36, 36, 36, 36, 36, 36, 36,
- 36, 36, 36, 36, 36, 36, 36, 36, 36, 36
-};
-
-static const short yyr2[] = { 0,
- 1, 2, 1, 1, 1, 4, 3, 4, 4, 1,
- 2, 3, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-static const short yydefact[] = { 0,
- 0, 0, 0, 0, 0, 1, 3, 4, 5, 0,
- 0, 0, 0, 2, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 25, 26, 24, 27, 28, 29,
- 30, 0, 10, 0, 7, 0, 0, 6, 11, 0,
- 8, 9, 12, 13, 0, 0
-};
-
-static const short yydefgoto[] = { 5,
- 6, 7, 8, 9, 32, 33, 34
-};
-
-static const short yypact[] = { -3,
- -2, 7, 1, 3, 0,-32768,-32768,-32768,-32768, 78,
- 8, 78, 78,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 18,-32768, 9,-32768, 38, 58,-32768,-32768, 2,
--32768,-32768,-32768,-32768, 19,-32768
-};
-
-static const short yypgoto[] = {-32768,
- 13,-32768,-32768,-32768, -1, -29,-32768
-};
-
-
-#define YYLAST 106
-
-
-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[] = { 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 "/cygnus/cygwin-b20/share/bison.simple"
-
-/* Skeleton output parser for bison,
- Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* As a special exception, when this file is copied by Bison into a
- Bison output file, you may use that output file without restriction.
- This special exception was added by the Free Software Foundation
- in version 1.24 of Bison. */
-
-#ifndef alloca
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
-#include <alloca.h>
-#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
-#include <malloc.h>
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-#include <malloc.h>
- #pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
-#endif /* __hpux */
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc. */
-#endif /* not GNU C. */
-#endif /* alloca not defined. */
-
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
-
-/* Note: there must be only one dollar sign in this file.
- It is replaced by the list of actions, each action
- as one case of the switch. */
-
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY -2
-#define YYEOF 0
-#define YYACCEPT return(0)
-#define YYABORT return(1)
-#define YYERROR goto yyerrlab1
-/* Like YYERROR except do call yyerror.
- This remains here temporarily to ease the
- transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
-#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { yychar = (token), yylval = (value); \
- yychar1 = YYTRANSLATE (yychar); \
- YYPOPSTACK; \
- goto yybackup; \
- } \
- else \
- { yyerror ("syntax error: cannot back up"); YYERROR; } \
-while (0)
-
-#define YYTERROR 1
-#define YYERRCODE 256
-
-#ifndef YYPURE
-#define YYLEX yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int yychar; /* the lookahead symbol */
-YYSTYPE yylval; /* the semantic value of the */
- /* lookahead symbol */
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc; /* location data for the lookahead */
- /* symbol */
-#endif
-
-int yynerrs; /* number of parse errors so far */
-#endif /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug; /* nonzero means print parse trace */
-/* Since this is uninitialized, it does not stop multiple parsers
- from coexisting. */
-#endif
-
-/* YYINITDEPTH indicates the initial size of the parser's stacks */
-
-#ifndef YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH is the maximum size the stacks can grow to
- (effective only if the built-in stack extension method is used). */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
-\f
-#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
-#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
-#else /* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-__yy_memcpy (to, from, count)
- char *to;
- char *from;
- int count;
-{
- register char *f = from;
- register char *t = to;
- register int i = count;
-
- while (i-- > 0)
- *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-__yy_memcpy (char *to, char *from, int count)
-{
- register char *f = from;
- register char *t = to;
- register int i = count;
-
- while (i-- > 0)
- *t++ = *f++;
-}
-
-#endif
-#endif
-\f
-#line 196 "/cygnus/cygwin-b20/share/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
- into yyparse. The argument should have type void *.
- It should actually point to an object.
- Grammar actions can access the variable by casting it
- to the proper pointer type. */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-int
-yyparse(YYPARSE_PARAM_ARG)
- YYPARSE_PARAM_DECL
-{
- register int yystate;
- register int yyn;
- register short *yyssp;
- register YYSTYPE *yyvsp;
- int yyerrstatus; /* number of tokens to shift before error messages enabled */
- int yychar1 = 0; /* lookahead token as an internal (translated) token number */
-
- short yyssa[YYINITDEPTH]; /* the state stack */
- YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
-
- short *yyss = yyssa; /* refer to the stacks thru separate pointers */
- YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
- YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
- YYLTYPE *yyls = yylsa;
- YYLTYPE *yylsp;
-
-#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK (yyvsp--, yyssp--)
-#endif
-
- int yystacksize = YYINITDEPTH;
-
-#ifdef YYPURE
- int yychar;
- YYSTYPE yylval;
- int yynerrs;
-#ifdef YYLSP_NEEDED
- YYLTYPE yylloc;
-#endif
-#endif
-
- YYSTYPE yyval; /* the variable used to return */
- /* semantic values from the action */
- /* routines */
-
- int yylen;
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Starting parse\n");
-#endif
-
- yystate = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
-
- yyssp = yyss - 1;
- yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
- yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in yystate . */
-/* In all cases, when you get here, the value and location stacks
- have just been pushed. so pushing a state here evens the stacks. */
-yynewstate:
-
- *++yyssp = yystate;
-
- if (yyssp >= yyss + yystacksize - 1)
- {
- /* Give user a chance to reallocate the stack */
- /* Use copies of these so that the &'s don't force the real ones into memory. */
- YYSTYPE *yyvs1 = yyvs;
- short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
- YYLTYPE *yyls1 = yyls;
-#endif
-
- /* Get the current used size of the three stacks, in elements. */
- int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
- /* Each stack pointer address is followed by the size of
- the data in use in that stack, in bytes. */
-#ifdef YYLSP_NEEDED
- /* This used to be a conditional around just the two extra args,
- but that might be undefined if yyoverflow is a macro. */
- yyoverflow("parser stack overflow",
- &yyss1, size * sizeof (*yyssp),
- &yyvs1, size * sizeof (*yyvsp),
- &yyls1, size * sizeof (*yylsp),
- &yystacksize);
-#else
- yyoverflow("parser stack overflow",
- &yyss1, size * sizeof (*yyssp),
- &yyvs1, size * sizeof (*yyvsp),
- &yystacksize);
-#endif
-
- yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
- yyls = yyls1;
-#endif
-#else /* no yyoverflow */
- /* Extend the stack our own way. */
- if (yystacksize >= YYMAXDEPTH)
- {
- yyerror("parser stack overflow");
- return 2;
- }
- yystacksize *= 2;
- if (yystacksize > YYMAXDEPTH)
- yystacksize = YYMAXDEPTH;
- yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
- yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
- yyssp = yyss + size - 1;
- yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
- yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
- if (yyssp >= yyss + yystacksize - 1)
- YYABORT;
- }
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
- goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state. */
-/* Read a lookahead token if we need one and don't already have one. */
-/* yyresume: */
-
- /* First try to decide what to do without reference to lookahead token. */
-
- yyn = yypact[yystate];
- if (yyn == YYFLAG)
- goto yydefault;
-
- /* Not known => get a lookahead token if don't already have one. */
-
- /* yychar is either YYEMPTY or YYEOF
- or a valid token in external form. */
-
- if (yychar == YYEMPTY)
- {
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Reading a token: ");
-#endif
- yychar = YYLEX;
- }
-
- /* Convert token to internal form (in yychar1) for indexing tables with */
-
- if (yychar <= 0) /* This means end of input. */
- {
- yychar1 = 0;
- yychar = YYEOF; /* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Now at end of input.\n");
-#endif
- }
- else
- {
- yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
- if (yydebug)
- {
- fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
- /* Give the individual parser a way to print the precise meaning
- of a token, for further debugging info. */
-#ifdef YYPRINT
- YYPRINT (stderr, yychar, yylval);
-#endif
- fprintf (stderr, ")\n");
- }
-#endif
- }
-
- yyn += yychar1;
- if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
- goto yydefault;
-
- yyn = yytable[yyn];
-
- /* yyn is what to do for this token type in this state.
- Negative => reduce, -yyn is rule number.
- Positive => shift, yyn is new state.
- New state is final state => don't bother to shift,
- just return success.
- 0, or most negative number => error. */
-
- if (yyn < 0)
- {
- if (yyn == YYFLAG)
- goto yyerrlab;
- yyn = -yyn;
- goto yyreduce;
- }
- else if (yyn == 0)
- goto yyerrlab;
-
- if (yyn == YYFINAL)
- YYACCEPT;
-
- /* Shift the lookahead token. */
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
- /* Discard the token being shifted unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
- *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
- *++yylsp = yylloc;
-#endif
-
- /* count tokens shifted since error; after three, turn off error status. */
- if (yyerrstatus) yyerrstatus--;
-
- yystate = yyn;
- goto yynewstate;
-
-/* Do the default action for the current state. */
-yydefault:
-
- yyn = yydefact[yystate];
- if (yyn == 0)
- goto yyerrlab;
-
-/* Do a reduction. yyn is the number of a rule to reduce with. */
-yyreduce:
- yylen = yyr2[yyn];
- if (yylen > 0)
- yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
- if (yydebug)
- {
- int i;
-
- fprintf (stderr, "Reducing via rule %d (line %d), ",
- yyn, yyrline[yyn]);
-
- /* Print the symbols being reduced, and their result. */
- for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
- fprintf (stderr, "%s ", yytname[yyrhs[i]]);
- fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
- }
-#endif
-
-
- switch (yyn) {
-
-case 6:
-#line 22 "rparse.y"
-{ section (); ;
- break;}
-case 7:
-#line 24 "rparse.y"
-{ setPciParams (yytext); ;
- break;}
-case 8:
-#line 28 "rparse.y"
-{ setLayout (); ;
- break;}
-case 9:
-#line 32 "rparse.y"
-{ setPad (); ;
- break;}
-case 12:
-#line 41 "rparse.y"
-{ assignKeyVal (yyvsp[-2], yyvsp[0]); ;
- break;}
-case 13:
-#line 43 "rparse.y"
-{ assignKeyStr (yyvsp[-2], yytext); ;
- break;}
-case 14:
-#line 46 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 15:
-#line 47 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 16:
-#line 48 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 17:
-#line 49 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 18:
-#line 50 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 19:
-#line 51 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 20:
-#line 52 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 21:
-#line 53 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 22:
-#line 54 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 23:
-#line 55 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 24:
-#line 56 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 25:
-#line 57 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 26:
-#line 58 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 27:
-#line 59 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 28:
-#line 60 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 29:
-#line 61 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-case 30:
-#line 62 "rparse.y"
-{ yyval=yyvsp[0]; ;
- break;}
-}
- /* the action file gets copied in in place of this dollarsign */
-#line 498 "/cygnus/cygwin-b20/share/bison.simple"
-\f
- yyvsp -= yylen;
- yyssp -= yylen;
-#ifdef YYLSP_NEEDED
- yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
- if (yydebug)
- {
- short *ssp1 = yyss - 1;
- fprintf (stderr, "state stack now");
- while (ssp1 != yyssp)
- fprintf (stderr, " %d", *++ssp1);
- fprintf (stderr, "\n");
- }
-#endif
-
- *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
- yylsp++;
- if (yylen == 0)
- {
- yylsp->first_line = yylloc.first_line;
- yylsp->first_column = yylloc.first_column;
- yylsp->last_line = (yylsp-1)->last_line;
- yylsp->last_column = (yylsp-1)->last_column;
- yylsp->text = 0;
- }
- else
- {
- yylsp->last_line = (yylsp+yylen-1)->last_line;
- yylsp->last_column = (yylsp+yylen-1)->last_column;
- }
-#endif
-
- /* Now "shift" the result of the reduction.
- Determine what state that goes to,
- based on the state we popped back to
- and the rule number reduced by. */
-
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
- if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTBASE];
-
- goto yynewstate;
-
-yyerrlab: /* here on detecting error */
-
- if (! yyerrstatus)
- /* If not already recovering from an error, report this error. */
- {
- ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
- yyn = yypact[yystate];
-
- if (yyn > YYFLAG && yyn < YYLAST)
- {
- int size = 0;
- char *msg;
- int x, count;
-
- count = 0;
- /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
- for (x = (yyn < 0 ? -yyn : 0);
- x < (sizeof(yytname) / sizeof(char *)); x++)
- if (yycheck[x + yyn] == x)
- size += strlen(yytname[x]) + 15, count++;
- msg = (char *) malloc(size + 15);
- if (msg != 0)
- {
- strcpy(msg, "parse error");
-
- if (count < 5)
- {
- count = 0;
- for (x = (yyn < 0 ? -yyn : 0);
- x < (sizeof(yytname) / sizeof(char *)); x++)
- if (yycheck[x + yyn] == x)
- {
- strcat(msg, count == 0 ? ", expecting `" : " or `");
- strcat(msg, yytname[x]);
- strcat(msg, "'");
- count++;
- }
- }
- yyerror(msg);
- free(msg);
- }
- else
- yyerror ("parse error; also virtual memory exceeded");
- }
- else
-#endif /* YYERROR_VERBOSE */
- yyerror("parse error");
- }
-
- goto yyerrlab1;
-yyerrlab1: /* here on error raised explicitly by an action */
-
- if (yyerrstatus == 3)
- {
- /* if just tried and failed to reuse lookahead token after an error, discard it. */
-
- /* return failure if at end of input */
- if (yychar == YYEOF)
- YYABORT;
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
- yychar = YYEMPTY;
- }
-
- /* Else will try to reuse lookahead token
- after shifting the error token. */
-
- yyerrstatus = 3; /* Each real token shifted decrements this */
-
- goto yyerrhandle;
-
-yyerrdefault: /* current state does not do anything special for the error token. */
-
-#if 0
- /* This is wrong; only states that explicitly want error tokens
- should shift them. */
- yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
- if (yyn) goto yydefault;
-#endif
-
-yyerrpop: /* pop the current state because it cannot handle the error token */
-
- if (yyssp == yyss) YYABORT;
- yyvsp--;
- yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
- yylsp--;
-#endif
-
-#if YYDEBUG != 0
- if (yydebug)
- {
- short *ssp1 = yyss - 1;
- fprintf (stderr, "Error: state stack now");
- while (ssp1 != yyssp)
- fprintf (stderr, " %d", *++ssp1);
- fprintf (stderr, "\n");
- }
-#endif
-
-yyerrhandle:
-
- yyn = yypact[yystate];
- if (yyn == YYFLAG)
- goto yyerrdefault;
-
- yyn += YYTERROR;
- if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
- goto yyerrdefault;
-
- yyn = yytable[yyn];
- if (yyn < 0)
- {
- if (yyn == YYFLAG)
- goto yyerrpop;
- yyn = -yyn;
- goto yyreduce;
- }
- else if (yyn == 0)
- goto yyerrpop;
-
- if (yyn == YYFINAL)
- YYACCEPT;
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Shifting error token, ");
-#endif
-
- *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
- *++yylsp = yylloc;
-#endif
-
- yystate = yyn;
- goto yynewstate;
-}
-#line 65 "rparse.y"
-
-
-
diff --git a/src/util/romparse/rparse.tab.h b/src/util/romparse/rparse.tab.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- *
- * 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.
- *
-*/
-
-
-
-#ifndef YYSTYPE
-#define YYSTYPE int
-#endif
-#define LBRACE 258
-#define RBRACE 259
-#define SECTION 260
-#define EQU 261
-#define VALUE 262
-#define STRING 263
-#define BOOT_MODE 264
-#define PARAM_INDEX 265
-#define OPTIONS 266
-#define MULTI_I2C_ID 267
-#define MY_I2C_ID 268
-#define CORE_FREQ_MHZ 269
-#define I2C_CLK_FREQ_KHZ 270
-#define EXE_FILE 271
-#define PCI_PARMS 272
-#define NEXT_DEV_ADDR 273
-#define NEXT_DEV_ADDR_EXT 274
-#define ADDRESS_DELAY 275
-#define SWPLL 276
-#define DEV_ADDR_EXT 277
-#define DEV_ADDR 278
-#define LAYOUT 279
-#define ALIGN 280
-#define PAD 281
-#define LENGTH 282
-#define PAD_FILE_ID 283
-
-
-extern YYSTYPE yylval;