summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 08462a7)
raw | patch | inline | side by side (parent: 08462a7)
author | Sandeep Nair <sandeep_n@ti.com> | |
Fri, 3 Jun 2011 23:22:14 +0000 (19:22 -0400) | ||
committer | Sandeep Nair <sandeep_n@ti.com> | |
Fri, 3 Jun 2011 23:22:14 +0000 (19:22 -0400) |
27 files changed:
diff --git a/src/cfg/c661x/iblcfg.h b/src/cfg/c66x/iblcfg.h
similarity index 98%
rename from src/cfg/c661x/iblcfg.h
rename to src/cfg/c66x/iblcfg.h
index d4478c56b77a3b4e610a691dd3c70882682b5744..eadb5bd23438de6deb64f7fa331e566c42be46dc 100644 (file)
rename from src/cfg/c661x/iblcfg.h
rename to src/cfg/c66x/iblcfg.h
index d4478c56b77a3b4e610a691dd3c70882682b5744..eadb5bd23438de6deb64f7fa331e566c42be46dc 100644 (file)
--- a/src/cfg/c661x/iblcfg.h
+++ b/src/cfg/c66x/iblcfg.h
* @file iblcfg.h
*
* @brief
- * Build time configurations for the c661x ibl are defined
+ * Build time configurations for the c66x ibl are defined
*
***************************************************************************/
#ifndef IBLCFG_H
index a4a7f603a026a8dfd51a7165677f9f25299a632a..d7d407e6ab92533d9afb3db971985be7c0d681ba 100644 (file)
ifeq ($(TARGET),c6457)
CSRC= c6457.c c6457init.c
else
- ifeq ($(TARGET),c661x)
- CSRC= c661x.c c661xinit.c c661xutil.c
+ ifeq ($(TARGET),c66x)
+ CSRC= c66x.c c66xinit.c c66xutil.c
else
- CSRC= c6472.c c6455.c c6474.c c6474l.c c6457.c c6472init.c c6455init.c c6474init.c c661x.c c661xinit.c c661xutil.c
+ CSRC= c6472.c c6455.c c6474.c c6474l.c c6457.c c6472init.c c6455init.c c6474init.c c66x.c c66xinit.c c66xutil.c
endif
endif
endif
similarity index 98%
rename from src/device/c661x/c661x.c
rename to src/device/c66x/c66x.c
index df1ec6adacb467f250f9b5f19d648f51253c0c41..522e760206a6f8339a90b0d8ea3e12b698bf56ce 100644 (file)
rename from src/device/c661x/c661x.c
rename to src/device/c66x/c66x.c
index df1ec6adacb467f250f9b5f19d648f51253c0c41..522e760206a6f8339a90b0d8ea3e12b698bf56ce 100644 (file)
--- a/src/device/c661x/c661x.c
+++ b/src/device/c66x/c66x.c
/************************************************************************************
- * FILE PURPOSE: C661x Device Specific functions
+ * FILE PURPOSE: C66x Device Specific functions
************************************************************************************
- * FILE NAME: c661x.c
+ * FILE NAME: c66x.c
*
* DESCRIPTION: Implements the device specific functions for the IBL
*
- * @file c661x.c
+ * @file c66x.c
*
* @brief
* This file implements the device specific functions for the IBL
* Enable the DDR
*
* @details
- * The DDR controller on the c661x is an emif 4.0. The controller is
+ * The DDR controller on the c66x is an emif 4.0. The controller is
* initialized directly with the supplied values
*/
void deviceDdrConfig (void)
similarity index 98%
rename from src/device/c661x/c661xinit.c
rename to src/device/c66x/c66xinit.c
index 96b159aee4bc0e1c7fabbe28c261ddd6276c30b3..deae692f3c2f42e578ce33024915ec02ced341b6 100644 (file)
rename from src/device/c661x/c661xinit.c
rename to src/device/c66x/c66xinit.c
index 96b159aee4bc0e1c7fabbe28c261ddd6276c30b3..deae692f3c2f42e578ce33024915ec02ced341b6 100644 (file)
/**
- * @file c661xinit.c
+ * @file c66xinit.c
*
* @brief
- * c661x functions used during the initial stage of the ibl load
+ * c66x functions used during the initial stage of the ibl load
*
*/
#include "ibl.h"
#include "pllapi.h"
#include "spi_api.h"
#include "spi_loc.h"
-#include "tiboot_c661x.h"
+#include "tiboot_c66x.h"
/**
similarity index 96%
rename from src/device/c661x/c661xutil.c
rename to src/device/c66x/c66xutil.c
index 12af098e731a57eb46bddbbcca0985f51ba14d83..387039b1818842a6fa1ea159a96e817cef5d1f64 100644 (file)
rename from src/device/c661x/c661xutil.c
rename to src/device/c66x/c66xutil.c
index 12af098e731a57eb46bddbbcca0985f51ba14d83..387039b1818842a6fa1ea159a96e817cef5d1f64 100644 (file)
/**
- * @file c661xutil.c
+ * @file c66xutil.c
*
* @brief
- * c661x functions used by both the ibl and utility programs
+ * c66x functions used by both the ibl and utility programs
*/
#include "device.h"
similarity index 99%
rename from src/device/c661x/target.h
rename to src/device/c66x/target.h
index b38d3e3428e82dcbb267995495e507aba9526dac..403cfe86103506576a6c6c6833dea1d453f71f84 100644 (file)
rename from src/device/c661x/target.h
rename to src/device/c66x/target.h
index b38d3e3428e82dcbb267995495e507aba9526dac..403cfe86103506576a6c6c6833dea1d453f71f84 100644 (file)
+++ b/src/device/c66x/target.h
/**
* @brief
- * The c661x devices use a register external to the PLL controller for prediv configuration
+ * The c66x devices use a register external to the PLL controller for prediv configuration
*/
#define chipPllExternalPrediv(x) TRUE
similarity index 95%
rename from src/device/c661x/tiboot_c661x.h
rename to src/device/c66x/tiboot_c66x.h
index 038b78db4fb1dc3714a00f20ff49d74d9c601634..d8e5f21cb301a85d3a261ca7ad456eb6de6f73f0 100644 (file)
rename from src/device/c661x/tiboot_c661x.h
rename to src/device/c66x/tiboot_c66x.h
index 038b78db4fb1dc3714a00f20ff49d74d9c601634..d8e5f21cb301a85d3a261ca7ad456eb6de6f73f0 100644 (file)
-#ifndef __TIBOOT_H__
-#define __TIBOOT_H__
-/******************************************************************************
- * FILE PURPOSE: Define Structures, MACROs and etc for TI Shared ROM Boot
- ******************************************************************************
- * FILE NAME: tiboot.h
+/*
*
- * DESCRIPTION: Define structures, macros and etc for the TI Shared ROM boot
- * process.
+ * 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:
*
- * TABS: NONE
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
*
- * $Id: $
+ * 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.
*
- * REVISION HISTORY:
+ * 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.
*
- * $Log: $
+ * 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.
*
- * (C) Copyright 2004 TELOGY Networks, Inc.
- ******************************************************************************/
+*/
+
+
+#ifndef __TIBOOT_H__
+#define __TIBOOT_H__
+
#include "types.h"
/*******************************************************************************
index ff20aace618be5e634b40bcbcedb026d0421f52e..6b267fb19a8e2d3bdcf301d41f080b865ad9eb81 100644 (file)
ifeq ($(TARGET),c6455)
CSRC= t64.c cpmacdrv.c pll.c emif31.c mdio.c gpio.c nandgpio.c i2c.c
else
- ifeq ($(TARGET),c661x)
+ ifeq ($(TARGET),c66x)
CSRC= t64.c pll.c cfgpll.c cfgpll2.c mdio.c i2c.c psc.c cpsw.c qm.c cpdma.c pa.c sgmii.c serdes.c gmacsl.c emif4.c gpio.c
CSRC+= nandemif25.c nandgpio.c spi.c nandspi.c noremif25.c norspi.c emif25.c spiutil.c
else
vpath % $(ECODIR)/i2c
endif
-ifeq ($(TARGET),c661x)
+ifeq ($(TARGET),c66x)
vpath % $(ECODIR)/plls/pll014phi
vpath % $(ECODIR)/mdio
vpath % $(ECODIR)/i2c
index fa0d37b908a84f7f3870580b6dacc00d25eb5f11..74ae4921ecd053ec6d6f84d07889663df1faae64 100644 (file)
#*********************************************************************************
-DEVICES= c6455 c6472 c6474 c6474l c6457 c661x
+DEVICES= c6455 c6472 c6474 c6474l c6457 c66x
ifndef IBL_ROOT
IBL_ROOT=../..
diff --git a/src/main/iblmain.c b/src/main/iblmain.c
index 1c5a20b08b23c631b4d89dd74ec25d2c453d8194..d376487ed70288e2096af6de756d10a19c94a7d1 100644 (file)
--- a/src/main/iblmain.c
+++ b/src/main/iblmain.c
cfg.csel = ibl.spiConfig.csel;
cfg.c2tdelay = ibl.spiConfig.c2tdelay;
- /* On c661x devices the PLL module has a built in divide by 6, and the SPI
+ /* On c66x devices the PLL module has a built in divide by 6, and the SPI
* has a maximum clock divider value of 0xff */
v = ibl.pllConfig[ibl_MAIN_PLL].pllOutFreqMhz / (DEVICE_SPI_MOD_DIVIDER * ibl.spiConfig.busFreqMHz);
if (v > 0xff)
diff --git a/src/make/Makefile b/src/make/Makefile
index d6b6514c29cae7b8232d54f612859fdaa5dc67a9..2d4ec81e197d4b233c5e0d61a81665dfa13440cc 100644 (file)
--- a/src/make/Makefile
+++ b/src/make/Makefile
#*
#* DESCRIPTION: Builds the Intermediate Boot Loader (IBL)
#*
-#* Usage: make c6455 | c6472 | c6474 | c6457 | c661x
+#* Usage: make c6455 | c6472 | c6474 | c6457 | c66x
#* [DEBUG=yes] /* Compiles for debug */
#* [ETH=no] /* Disables ethernet support */
#* [BIS=no] /* Disables BIS interpreter */
#*
#* or to make a board specific configuraiton
#*
-#* make evm_c6455 | evm_c6472 | evm_c6474 | evm_c6457 | evm_c661x
+#* make evm_c6455 | evm_c6472 | evm_c6474 | evm_c6457 | evm_c66x
#*
#* or to test the builds by making all the devices and testing excludes
#*
#* make test_build
#*******************************************************************************************
-IBLS_C6X= c6455 c6472 c6474 c6457 c661x
+IBLS_C6X= c6455 c6472 c6474 c6457 c66x
EVMS_C6X= evm_c6455 evm_c6472 evm_c6474
.PHONY: all $(IBLS_C6X) evm_c6455 evm_c6472 evm_c6474 evm_c6457 evm_c6678_i2c evm_c6670_i2c
-.PHONY: test_c661x test_c6455 test_c6472 test_c6474 test_c6457 clean
+.PHONY: test_c66x test_c6455 test_c6472 test_c6474 test_c6457 clean
all:
EVM_6608_SPI_DEFS= SPI_MODE=1 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=1 SPI_CLKDIV=8 SPI_ROM=1
evm_c6608:
- make -f makestg1 ARCH=c64x TARGET=c661x I2C=no I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=0x500 ENDIAN_MODE=little CEXCLUDES=I2C SPI_DEFS='$(EVM_6608_SPI_DEFS)' c661x
+ make -f makestg1 ARCH=c64x TARGET=c66x I2C=no I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=0x500 ENDIAN_MODE=little CEXCLUDES=I2C SPI_DEFS='$(EVM_6608_SPI_DEFS)' c66x
# The 667x EVM SPI/NOR Boot
EVM_667x_SPI_DEFS= SPI_MODE=1 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=1 SPI_CLKDIV=8 SPI_ROM=1
evm_c667x_spi:
- make -f makestg1 ARCH=c64x TARGET=c661x I2C=no I2C_BUS_ADDR=0x51 I2C_MAP_ADDR=0x500 ENDIAN_MODE=little CEXCLUDES=I2C SPI_DEFS='$(EVM_667x_SPI_DEFS)' c661x
+ make -f makestg1 ARCH=c64x TARGET=c66x I2C=no I2C_BUS_ADDR=0x51 I2C_MAP_ADDR=0x500 ENDIAN_MODE=little CEXCLUDES=I2C SPI_DEFS='$(EVM_667x_SPI_DEFS)' c66x
evm_c6678_i2c:
make -f makestg1 I2C_BUS_ADDR=$(I2C_BUS_ADDR) I2C_MAP_ADDR=$(I2C_MAP_ADDR) \
-ENDIAN_MODE=$(ENDIAN) ARCH=c64x TARGET=c661x SPI=no SPI_DEFS='$(EVM_667x_SPI_DEFS)' \
-CEXCLUDES='COFF BIS NAND_GPIO' c661x
- cp -f ibl_c661x/i2crom.dat bin/i2crom_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX).dat
- cp -f ibl_c661x/i2crom.bin bin/i2crom_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX).bin
- cp -f ../util/i2cConfig/i2cparam_c661x_$(ENDIAN_SFX).out bin/i2cparam_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX)_$(I2C_MAP_ADDR).out
+ENDIAN_MODE=$(ENDIAN) ARCH=c64x TARGET=c66x SPI=no SPI_DEFS='$(EVM_667x_SPI_DEFS)' \
+CEXCLUDES='COFF BIS NAND_GPIO' c66x
+ cp -f ibl_c66x/i2crom.dat bin/i2crom_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX).dat
+ cp -f ibl_c66x/i2crom.bin bin/i2crom_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX).bin
+ cp -f ../util/i2cConfig/i2cparam_c66x_$(ENDIAN_SFX).out bin/i2cparam_$(I2C_BUS_ADDR)_c6678_$(ENDIAN_SFX)_$(I2C_MAP_ADDR).out
evm_c6670_i2c:
make -f makestg1 I2C_BUS_ADDR=$(I2C_BUS_ADDR) I2C_MAP_ADDR=$(I2C_MAP_ADDR) \
-ENDIAN_MODE=$(ENDIAN) ARCH=c64x TARGET=c661x SPI=no SPI_DEFS='$(EVM_667x_SPI_DEFS)' \
-CEXCLUDES='COFF BIS NAND_EMIF' c661x
- cp -f ibl_c661x/i2crom.dat bin/i2crom_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX).dat
- cp -f ibl_c661x/i2crom.bin bin/i2crom_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX).bin
- cp -f ../util/i2cConfig/i2cparam_c661x_$(ENDIAN_SFX).out bin/i2cparam_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX)_$(I2C_MAP_ADDR).out
-
-test_c661x:
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES='SPI NOR_SPI NAND_SPI' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c661x
- make -f makestg1 ARCH=c64x TARGET=c661x ENDIAN_MODE=both CEXCLUDES=I2C SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' c661x
+ENDIAN_MODE=$(ENDIAN) ARCH=c64x TARGET=c66x SPI=no SPI_DEFS='$(EVM_667x_SPI_DEFS)' \
+CEXCLUDES='COFF BIS NAND_EMIF' c66x
+ cp -f ibl_c66x/i2crom.dat bin/i2crom_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX).dat
+ cp -f ibl_c66x/i2crom.bin bin/i2crom_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX).bin
+ cp -f ../util/i2cConfig/i2cparam_c66x_$(ENDIAN_SFX).out bin/i2cparam_$(I2C_BUS_ADDR)_c6670_$(ENDIAN_SFX)_$(I2C_MAP_ADDR).out
+
+test_c66x:
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='NOR_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='NAND_SPI' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='NAND_EMIF NOR_EMIF' SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES='SPI NOR_SPI NAND_SPI' I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=no c66x
+ make -f makestg1 ARCH=c64x TARGET=c66x ENDIAN_MODE=both CEXCLUDES=I2C SPI_DEFS='SPI_ROM=1 SPI_MODE=3 SPI_ADDR_WIDTH=24 SPI_NPIN=5 SPI_CSEL=2 SPI_C2TDEL=8 SPI_CLKDIV=0x20' c66x
# Test - builds all the targets, with single component exclusion
make -f makestg1 ARCH=c64x TARGET=c6474 I2C_BUS_ADDR=0x50 I2C_MAP_ADDR=$(I2C_MAP_ADDR) COMPACT_I2C=yes ENDIAN_MODE=both CEXCLUDES=BLOB c6474
-test_build: test_c6455 test_c6457 test_c6472 test_c6474 test_c661x
+test_build: test_c6455 test_c6457 test_c6472 test_c6474 test_c66x
# will need to add a line for each additional ARCH type added
make -f makestg2 cleant ARCH=c64x TARGET=c6474
make -f makestg2 cleant ARCH=c64x TARGET=c6455
make -f makestg2 cleant ARCH=c64x TARGET=c6457
- make -f makestg2 cleant ARCH=c64x TARGET=c661x
+ make -f makestg2 cleant ARCH=c64x TARGET=c66x
make -C ../util/bconvert clean
make -C ../util/btoccs clean
make -C ../util/i2cConfig clean ARCH=c64x TARGET=c6455
make -C ../util/i2cConfig clean ARCH=c64x TARGET=c6472
make -C ../util/i2cConfig clean ARCH=c64x TARGET=c6474
make -C ../util/i2cConfig clean ARCH=c64x TARGET=c6457
- make -C ../util/i2cConfig clean ARCH=c64x TARGET=c661x
+ make -C ../util/i2cConfig clean ARCH=c64x TARGET=c66x
make -C ../util/romparse clean
make -C ../test/test1 clean
make -C ../test/test2 clean
similarity index 100%
rename from src/make/ibl_c661x/i2crom.map.pre
rename to src/make/ibl_c66x/i2crom.map.pre
rename from src/make/ibl_c661x/i2crom.map.pre
rename to src/make/ibl_c66x/i2crom.map.pre
similarity index 99%
rename from src/make/ibl_c661x/ibl.cmd
rename to src/make/ibl_c66x/ibl.cmd
index 1a7139077b9dfd8c2f9bee96e0aa6d21d547bacc..d31d8e259afdc19903a9a1b2fee598e88a05b5fb 100644 (file)
rename from src/make/ibl_c661x/ibl.cmd
rename to src/make/ibl_c66x/ibl.cmd
index 1a7139077b9dfd8c2f9bee96e0aa6d21d547bacc..d31d8e259afdc19903a9a1b2fee598e88a05b5fb 100644 (file)
/************************************************************************************
- * FILE PURPOSE: Define the memory usage of the ibl module for the c661x
+ * FILE PURPOSE: Define the memory usage of the ibl module for the c66x
************************************************************************************
* FILE NAME: ibl.cmd
*
similarity index 100%
rename from src/make/ibl_c661x/ibl_common.inc
rename to src/make/ibl_c66x/ibl_common.inc
rename from src/make/ibl_c661x/ibl_common.inc
rename to src/make/ibl_c66x/ibl_common.inc
similarity index 100%
rename from src/make/ibl_c661x/ibl_init.cmd
rename to src/make/ibl_c66x/ibl_init.cmd
rename from src/make/ibl_c661x/ibl_init.cmd
rename to src/make/ibl_c66x/ibl_init.cmd
similarity index 100%
rename from src/make/ibl_c661x/ibl_init.rmd
rename to src/make/ibl_c66x/ibl_init.rmd
rename from src/make/ibl_c661x/ibl_init.rmd
rename to src/make/ibl_c66x/ibl_init.rmd
similarity index 100%
rename from src/make/ibl_c661x/ibl_init_image.rmd
rename to src/make/ibl_c66x/ibl_init_image.rmd
rename from src/make/ibl_c661x/ibl_init_image.rmd
rename to src/make/ibl_c66x/ibl_init_image.rmd
diff --git a/src/make/ibl_c661x/ibl_init_objs_template.inc b/src/make/ibl_c66x/ibl_init_objs_template.inc
similarity index 88%
rename from src/make/ibl_c661x/ibl_init_objs_template.inc
rename to src/make/ibl_c66x/ibl_init_objs_template.inc
index 414795ffae809920823bc9f9627908ec9aa5bbaa..0d829ba6c6b3a350641c1e201ee5c956a836f587 100644 (file)
rename from src/make/ibl_c661x/ibl_init_objs_template.inc
rename to src/make/ibl_c66x/ibl_init_objs_template.inc
index 414795ffae809920823bc9f9627908ec9aa5bbaa..0d829ba6c6b3a350641c1e201ee5c956a836f587 100644 (file)
*/
../main/c64x/make/iblinit.ENDIAN_TAG.oc
-../device/c64x/make/c661xinit.ENDIAN_TAG.oc
-../device/c64x/make/c661xutil.ENDIAN_TAG.oc
+../device/c64x/make/c66xinit.ENDIAN_TAG.oc
+../device/c64x/make/c66xutil.ENDIAN_TAG.oc
../device/c64x/make/c64x.ENDIAN_TAG.oa
../hw/c64x/make/pll.ENDIAN_TAG.oc
../hw/c64x/make/cfgpll.ENDIAN_TAG.oc
similarity index 96%
rename from src/make/ibl_c661x/ibl_objs_template.inc
rename to src/make/ibl_c66x/ibl_objs_template.inc
index d861fa594d3232f29932fd5bcbc6f543970cbb01..9e24923a6b0fae7bed444d757e44afd4f77ffa7c 100644 (file)
rename from src/make/ibl_c661x/ibl_objs_template.inc
rename to src/make/ibl_c66x/ibl_objs_template.inc
index d861fa594d3232f29932fd5bcbc6f543970cbb01..9e24923a6b0fae7bed444d757e44afd4f77ffa7c 100644 (file)
*/
../main/c64x/make/iblmain.ENDIAN_TAG.oc
-../device/c64x/make/c661x.ENDIAN_TAG.oc
-../device/c64x/make/c661xutil.ENDIAN_TAG.oc
+../device/c64x/make/c66x.ENDIAN_TAG.oc
+../device/c64x/make/c66xutil.ENDIAN_TAG.oc
../driver/c64x/make/timer.ENDIAN_TAG.oc
../hw/c64x/make/t64.ENDIAN_TAG.oc
../hw/c64x/make/psc.ENDIAN_TAG.oc
similarity index 100%
rename from src/make/ibl_c661x/spiRom.map.pre
rename to src/make/ibl_c66x/spiRom.map.pre
rename from src/make/ibl_c661x/spiRom.map.pre
rename to src/make/ibl_c66x/spiRom.map.pre
diff --git a/src/make/makestg1 b/src/make/makestg1
index 30a689d6e48c89f3564c6e83c025cfa1e80080c6..1dd12405cfc4ab047888086f3d15690b43499328 100644 (file)
--- a/src/make/makestg1
+++ b/src/make/makestg1
#*
#* DESCRIPTION: Builds the Intermediate Boot Loader (IBL)
#*
-#* Usage: make c6455 | c6472 | c6474 | c6457 | c661x [DEBUG=yes] [ETH=no] [NAND=no] \
+#* Usage: make c6455 | c6472 | c6474 | c6457 | c66x [DEBUG=yes] [ETH=no] [NAND=no] \
#* [BIS=no] [COFF=no] [BLOB=no] [ELF=no] [ENDIAN= both | big | little] [I2C_BUS_ADDR= 0x50 | 0x51] \
#* [COMPACT_I2C=yes] [I2C_SIZE_BYTES=..]
#*******************************************************************************************
-IBLS_C6X= c6455 c6472 c6474 c6474l c6457 c661x
+IBLS_C6X= c6455 c6472 c6474 c6474l c6457 c66x
# Excluding functions from the build reduces the I2C eeprom memory used and
diff --git a/src/make/makestg2 b/src/make/makestg2
index e7aefd63741fee91ba023c82e8328600f745b160..0f89a8c6604fcc8f2f1810dd1ac286bb65b46069 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)
$(TARGETS): iblMain
-ifeq ($(TARGET),c661x)
+ifeq ($(TARGET),c66x)
HAS_SPI=1
else
HAS_SPI=0
index 59d5ffb912779872574cd6c9724c35a666c72d24..4f4689becfd3d7f98b662b3c51642454782e326d 100644 (file)
#*
#***************************************************************
-DEVICES= c6455 c6472 c6474 c6474l c6457 c661x
+DEVICES= c6455 c6472 c6474 c6474l c6457 c66x
all:
@echo must specify a target [ $(DEVICES) ]
index 8e53a726f6cc83de05dff838a1194b641a8e4f50..601b605c734030cedea0b84907ef95aed5ab98fd 100644 (file)
#*
#**************************************************************************
-DEVICES= c6455 c6472 c6474 c6474l c6457 c661x
+DEVICES= c6455 c6472 c6474 c6474l c6457 c66x
ifndef IBL_ROOT
IBL_ROOT=../..
# The PLL object files are device specific
PLL_PATH= ../../hw/c64x/make
-ifeq ($(TARGET),c661x)
+ifeq ($(TARGET),c66x)
PLL_OBJS= $(PLL_PATH)/pll.$(IEXT).oc $(PLL_PATH)/cfgpll.$(IEXT).oc $(PLL_PATH)/cfgpll2.$(IEXT).oc
PLL_OBJS+= ../../device/c64x/make/c64x.$(IEXT).oa
PSC_OBJS= ../../hw/c64x/make/psc.$(IEXT).oc
ECODIR= $(IBL_ROOT)/util/i2cConfig
-ifeq ($(TARGET),c661x)
+ifeq ($(TARGET),c66x)
TFILES= ../../device/c64x/make/$(TARGET)util.$(IEXT).oc
endif
index 6f57aea9d6ffa3e246b017f9cca7a757788bc3bf..a06d70a3fc267e173ac3aff9ee03486172dbde4f 100644 (file)
current_table.common.length = 30;
- #ifdef c661x
+ #ifdef c66x
if (current_table.common.boot_mode == BOOT_MODE_SPI)
current_table.common.length = sizeof(BOOT_PARAMS_SPI_T);
else
break;
case CORE_FREQ_MHZ:
- #ifdef c661x
+ #ifdef c66x
if (current_table.common.boot_mode == BOOT_MODE_SPI) {
current_table.spi.cpuFreqMhz = value;
break;
case ADDRESS_DELAY: current_table.i2c.address_delay = value;
break;
-#if (!defined(c6455) && !defined(c661x))
+#if (!defined(c6455) && !defined(c66x))
case SWPLL: current_table.i2c.swPll = value;
break;
#endif
-#ifdef c661x
+#ifdef c66x
case SWPLL_PREDIV: current_table.common.swPllCfg_lsw &= 0x00ff;
current_table.common.swPllCfg_lsw |= ((value & 0xff) << 16);
break;
break;
-#ifdef c661x
+#ifdef c66x
case N_PINS: current_table.spi.nPins = value;
break;
for (j = 0; j < NUM_BOOT_PARAM_TABLES; j++) {
if (progFile[i].tag[j] >= 0) {
- #ifdef c661x
+ #ifdef c66x
if (boot_params[progFile[i].tag[j]].common.boot_mode == BOOT_MODE_SPI) {
boot_params[progFile[i].tag[j]].spi.read_addr_lsw = (progFile[i].addressBytes & 0xffff);
boot_params[progFile[i].tag[j]].spi.read_addr_msw = (progFile[i].addressBytes >> 16) & 0xffff;
index 58fcf57697f35ae2a50ebe46d8f0f7e69d049a59..b179f3543d364adfcc725c6bd89143c78742d5f9 100644 (file)
#include "tiboot_c6455.h"
#elif defined(c6457)
#include "tiboot_c6457.h"
-#elif defined(c661x)
- #include "tiboot_c661x.h"
+#elif defined(c66x)
+ #include "tiboot_c66x.h"
#else
#error invalid or missing device specification
#endif