Single Binary Build Update

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/src/make/makestg2 b/src/make/makestg2
index f053e4092e90425d3468513aceb6b120b9bb4260..d4c666570326e344852af53e9a28ada8b35d7ee7 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
@@ -52,6 +52,8 @@ include $(IBL_ROOT)/make/$(ARCH)/makedefs.mk
 
 export ARCH
 export TARGET
+export EVM
+export I2C_MAP_ADDR
 
 .PHONY:  $(TARGETS) i2crom spiRom compare iblInit iblMain $(MODULES) $(CFG_MODULES)
 .PHONY:  utils clean clean_modules hwClean cleant
@@ -210,7 +212,7 @@ endif
        make -C $(IBL_ROOT)/util/btoccs
        make -C $(IBL_ROOT)/util/romparse TARGET=$(TARGET)
        make -C $(IBL_ROOT)/util/bconvert
-       make -C $(IBL_ROOT)/util/iblConfig/build
+       make -C $(IBL_ROOT)/util/iblConfig/build EVM=$(EVM) I2C_MAP_ADDR=$(I2C_MAP_ADDR)
 
 clean: $(CLEAN_MODULES) hwClean
        

diff --git a/src/util/iblConfig/build/Makefile b/src/util/iblConfig/build/Makefile
index 555c11c1b890986896dbc2f5ccca72ee9b57e510..fdf50da3a3e4780a878a861dd6963653797dd6af 100644 (file)
--- a/src/util/iblConfig/build/Makefile
+++ b/src/util/iblConfig/build/Makefile
@@ -12,7 +12,7 @@ LD_OPTS =
 C_OPTS =
 
 #RT_LIB = $(C_DIR)/lib/libc.a
-C_OPTS += -O2
+C_OPTS += -O2 -DEVM=$(EVM) -DI2C_MAP_ADDR=$(I2C_MAP_ADDR)
 
 #LNK_OPTS += -i$(C_DIR)/lib -c $(RT_LIB)
 LNK_OPTS +=
@@ -34,8 +34,8 @@ CLIB_INC = $(C_DIR)/include/
 
 HEADERS = $(filter %.h, $(FILES))
 INCL = -I$(CLIB_INC) $(patsubst %,-I%,$(VPATH))
-TARGET_TEMP = $(patsubst %,-D%,$(TARGET))
-DEFINE_TARGET = $(patsubst %,%_TARGET,$(TARGET_TEMP))
+BOARD_TEMP = $(patsubst %,-D%,$(BOARD))
+DEFINE_BOARD = $(patsubst %,%_BOARD,$(BOARD_TEMP))
 
 OBJS = $(patsubst %.c,$(OBJ_DIR)/%.obj,$(filter %.c, $(FILES)))
 
@@ -48,7 +48,7 @@ $(IBLCFG_EXE): $(OBJS)
        cp $@ $@.dbg 
 
 $(OBJ_DIR)/%.obj: %.c $(HEADERS) $(OBJ_DIR)/.created
-       $(CC) -c $(C_OPTS) $(INCL) $(DEFINE_TARGET) $< -o $@
+       $(CC) -c $(C_OPTS) $(INCL) $(DEFINE_BOARD) $< -o $@
 
 $(OBJ_DIR)/.created:
        mkdir -p $(OBJ_DIR)

diff --git a/src/util/iblConfig/src/iblConfig.c b/src/util/iblConfig/src/iblConfig.c
index de2763ee525ab5d1b1edd2cfe70ce26e628cca9e..64f4b3a1986bc1b3da477099de256a41a4ff069f 100644 (file)
--- a/src/util/iblConfig/src/iblConfig.c
+++ b/src/util/iblConfig/src/iblConfig.c
@@ -17,7 +17,7 @@ char *input_file = "input.txt";
 
 char        file_name[MAX_LINE_LENGTH];
 uint32_t    device_id;
-uint32_t    offset;
+uint32_t    offset = I2C_MAP_ADDR;
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 typedef ibl_t (*ibl_config_fn)(void);