Updated romparse and the makefiles with the new i2c layout

[keystone-rtos/ibl.git] / src / util / romparse / rparse.y

diff --git a/src/util/romparse/rparse.y b/src/util/romparse/rparse.y
index e3ebf07aba075754acfd1ca5b055a2957009ee44..288681dce2b71fa68014548e859bd18df29bc8d4 100644 (file)
--- a/src/util/romparse/rparse.y
+++ b/src/util/romparse/rparse.y
@@ -6,19 +6,27 @@ extern char *yytext;
 %token LBRACE RBRACE SECTION EQU VALUE STRING BOOT_MODE PARAM_INDEX OPTIONS 
 %token MULTI_I2C_ID MY_I2C_ID CORE_FREQ_MHZ I2C_CLK_FREQ_KHZ 
 %token EXE_FILE PCI_PARMS NEXT_DEV_ADDR NEXT_DEV_ADDR_EXT ADDRESS_DELAY SWPLL
-%token DEV_ADDR_EXT DEV_ADDR
+%token DEV_ADDR_EXT DEV_ADDR LAYOUT ALIGN
 %%
 
-promspec   : bootParams
-                  | promspec bootParams
+promspec   : segment
+                  | promspec segment
                   ;
 
+segment           : bootParams
+                  | layout
+                  ;
+
 bootParams : SECTION LBRACE assigns RBRACE
                         { section (); }
                   | PCI_PARMS EQU STRING
                     { setPciParams (yytext); }
                   ;
 
+layout     : LAYOUT LBRACE assigns RBRACE
+                        { setLayout ();  }
+                  ;
+
 
 assigns    : assign
                   | assigns assign
@@ -44,6 +52,7 @@ keyword    : BOOT_MODE                     {  $$=$1;  }
                   | ADDRESS_DELAY       {  $$=$1;  }
                   | SWPLL                               {  $$=$1;  }
                   | DEV_ADDR                    {  $$=$1;  }
+                  | ALIGN                               {  $$=$1;  }
                   ;
 
 %%