diff --git a/src/make/makestg2 b/src/make/makestg2
index d650fc58c11fb9679db951144fadfb2f24e81e7e..e70017391fd4a8e17dfae874e5fcd4794a9eaa8f 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
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)
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
endif
+ifeq (EXCLUDE_SPI, $(strip $(findstring EXCLUDE_SPI, $(MAINDEFS))))
+ HAS_SPI=0
+endif
+
+ifeq (EXCLUDE_I2C, $(strip $(findstring EXCLUDE_I2C, $(MAINDEFS))))
+ HAS_I2C=0
+else
+ HAS_I2C=1
+endif
+
# The I2C creation options. The I2C map file is run through the C pre-processor to generate
# the desired I2C mapping. There are three possible configurations - an i2c which has
# both endians present, or an I2C with only one of the endians
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)
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:
../util/btoccs/b2i2c ibl_$(TARGET)/ibl.b ibl_$(TARGET)/ibl.i2c.b
../util/btoccs/b2ccs ibl_$(TARGET)/ibl.i2c.b ibl_$(TARGET)/ibl_init.i2c.$(IEXT).ccs
- bash ../util/symExtract/symExtract ibl_$(TARGET)/ibl_$(TARGET)_init.map ibl_$(TARGET)/ibl_init_symbols.inc $(COMMON_SYMBOLS)
+ sed -e 's/\\r//' ../util/symExtract/symExtract > ../util/symExtract/symExtract_unix
+ bash ../util/symExtract/symExtract_unix ibl_$(TARGET)/ibl_$(TARGET)_init.map ibl_$(TARGET)/ibl_init_symbols.inc $(COMMON_SYMBOLS)
+ rm -f ../util/symExtract/symExtract_unix
iblMain: iblInit $(CFG_MODULES) $(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)
- 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)'
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
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