Adding back support for updating i2c config params

[keystone-rtos/ibl.git] / src / make / makestg2

diff --git a/src/make/makestg2 b/src/make/makestg2
index 0f85c1660abe862f20ab40605cb5fbc07bd8b091..7f21da7764a84974d673a70bd534b2c9d155ca05 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
@@ -19,7 +19,7 @@ CLEAN_MODULES=$(addprefix clean_,$(subst hw,,$(MODULES)))
 CLEAN_MODULES+=$(addprefix clean_,$(CFG_MODULES))
 
 
-TARGETS= c6472 c6474 c6474l c6455 c6457 c661x
+TARGETS= c6472 c6474 c6474l c6455 c6457 c66x
 
 # The main module needs to know the device address of the i2c where the image map resides
 MAINDEFS=-DIBL_CFG_I2C_MAP_TABLE_DATA_BUS_ADDR=$(I2C_BUS_ADDR)
@@ -52,13 +52,15 @@ 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
 
 $(TARGETS): iblMain
 
-ifeq ($(TARGET),c661x)
+ifeq ($(TARGET),c66x)
     HAS_SPI=1
 else
     HAS_SPI=0
@@ -85,6 +87,7 @@ I2C_INIT_LE_FILE= '"ibl_$(TARGET)/ibl_init.i2c.le.ccs"'
 
 I2C_DEFS= -DI2C_BUS_ADDR=$(I2C_BUS_ADDR)
 I2C_DEFS+= -DI2C_MAP_ADDR=$(I2C_MAP_ADDR)
+I2C_DEFS+= -DEVM=$(EVM)
 
 ifeq ($(I2CROM),both) 
  I2C_DEFS+= -DINIT_EXE_FILE=$(I2C_INIT_LE_FILE)
@@ -127,15 +130,16 @@ else
  endif
 endif
 
-ifeq ($(HAS_SPI),0)
-    SPI_CFG=    
-endif
 
 i2crom:
        $(CC) -ppo -I../cfg/$(TARGET) $(I2C_DEFS) ibl_$(TARGET)/$@.map.pre
        ../util/romparse/romparse $(COMPACT) -rom_base $(I2C_BUS_ADDR) ibl_$(TARGET)/$@.map.pp
        $(CP) i2crom.ccs ibl_$(TARGET)/$@.ccs
        $(CP) i2crom.ccs ibl_$(TARGET)/$@.dat
+       ../util/btoccs/ccs2bin -swap ibl_$(TARGET)/$@.ccs ibl_$(TARGET)/$@.bin
+       cp ibl_$(TARGET)/$@.bin ../util/iblConfig/build/ibl.bin
+       (cd ../util/iblConfig/build;./iblConfig.out)
+       cp ../util/iblConfig/build/ibl.bin ibl_$(TARGET)/$@.bin
        $(RM) i2crom.ccs ibl_le.b ibl.b
 
 spiRom:
@@ -206,17 +210,15 @@ $(CFG_MODULES):
 
 utils:
 ifeq ($(HAS_SPI),1)
-       make -C $(IBL_ROOT)/util/spiWrite TARGET=$(TARGET) SPI_DEFS='$(SPI_DEFS)' MAINDEFS='$(MAINDEFS) $(SPI_CFG)' $(TARGET)
-       make -C $(IBL_ROOT)/util/spiConfig TARGET=$(TARGET) SPI_DEFS='$(SPI_DEFS)' MAINDEFS='$(MAINDEFS) $(SPI_CFG)' $(TARGET)
+#make -C $(IBL_ROOT)/util/spiConfig TARGET=$(TARGET) SPI_DEFS='$(SPI_DEFS)' MAINDEFS='$(MAINDEFS) $(SPI_CFG)' $(TARGET)
 endif
        make -C $(IBL_ROOT)/util/btoccs
        make -C $(IBL_ROOT)/util/romparse TARGET=$(TARGET)
 ifeq ($(HAS_I2C),1)
-       make -C $(IBL_ROOT)/util/i2cRead  TARGET=$(TARGET) $(TARGET) 
-       make -C $(IBL_ROOT)/util/i2cWrite TARGET=$(TARGET) I2C_SIZE_BYTES=$(I2C_SIZE_BYTES) MAINDEFS='$(MAINDEFS) $(SPI_CFG)' $(TARGET)
        make -C $(IBL_ROOT)/util/i2cConfig $(TARGET) MAINDEFS='$(MAINDEFS) $(SPI_CFG)' 
 endif
        make -C $(IBL_ROOT)/util/bconvert
+       make -C $(IBL_ROOT)/util/iblConfig/build EVM=$(EVM) I2C_MAP_ADDR=$(I2C_MAP_ADDR)
 
 clean: $(CLEAN_MODULES) hwClean
        
@@ -251,19 +253,18 @@ cleant:
        rm -rf ibl_$(TARGET)/ibl_init.i2c.le.ccs
        rm -rf ibl_$(TARGET)/ibl_init.le.ccs
        rm -rf ibl_$(TARGET)/ibl_init.be.ccs
-       rm -rf ibl_$(TARGET)/i2crom.ccs
-       rm -rf ibl_$(TARGET)/i2crom.dat
-       rm -rf ibl_$(TARGET)/i2crom_0x50.dat
-       rm -rf ibl_$(TARGET)/i2crom_0x51.dat
-       rm -rf ibl_$(TARGET)/i2crom.map.pp
+       rm -rf ibl_$(TARGET)/i2crom*.ccs
+       rm -rf ibl_$(TARGET)/i2crom*.dat
+       rm -rf ibl_$(TARGET)/i2crom*.bin
+       rm -rf ibl_$(TARGET)/i2crom*.map.pp
        rm -rf ibl_$(TARGET)/ibl_init_objs.inc
        rm -rf ibl_$(TARGET)/ibl_init_objs.pp
        rm -rf ibl_$(TARGET)/ibl_init_symbols.inc
        rm -rf ibl_$(TARGET)/ibl_objs.inc
        rm -rf ibl_$(TARGET)/ibl_objs.pp
        rm -rf ibl_$(TARGET)/ibl_objs.tmp
-       rm -rf ibl_$(TARGET)/spiRom.dat
-       rm -rf ibl_$(TARGET)/spiRom.map.pp
+       rm -rf ibl_$(TARGET)/spiRom*.dat
+       rm -rf ibl_$(TARGET)/spiRom*.map.pp