summaryrefslogtreecommitdiff
path: root/cleopatre/u-boot-1.1.6
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/u-boot-1.1.6')
-rw-r--r--cleopatre/u-boot-1.1.6/board/arizona/arizona.c12
-rw-r--r--cleopatre/u-boot-1.1.6/board/arizona/flash_spi.c4
-rw-r--r--cleopatre/u-boot-1.1.6/board/sdk300/flash.c4
-rw-r--r--cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c12
-rw-r--r--cleopatre/u-boot-1.1.6/common/cmd_misc.c2
-rw-r--r--cleopatre/u-boot-1.1.6/common/cmd_spidboot.c6
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/serial.c2
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/wdt.c2
-rw-r--r--cleopatre/u-boot-1.1.6/drivers/netspcmac_eth.c8
-rw-r--r--cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3/nvram.h2
-rw-r--r--cleopatre/u-boot-1.1.6/net/spidupd.c8
11 files changed, 31 insertions, 31 deletions
diff --git a/cleopatre/u-boot-1.1.6/board/arizona/arizona.c b/cleopatre/u-boot-1.1.6/board/arizona/arizona.c
index 6dd1743cbb..67b160607a 100644
--- a/cleopatre/u-boot-1.1.6/board/arizona/arizona.c
+++ b/cleopatre/u-boot-1.1.6/board/arizona/arizona.c
@@ -38,12 +38,12 @@ void show_boot_progress(int progress)
*/
static ulong get_sdram_size(bd_t *bd)
{
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
ulong sconr;
ulong row, col, bank, byte;
/* We will access to NVRAM through SPI direct access */
- nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
sconr = nvram->sdram_config;
bank = 1 << ( ( (sconr & SCONR_s_bank_addr_width_RegisterMask) >> SCONR_s_bank_addr_width_BitAddressOffset) + 1);
@@ -62,14 +62,14 @@ static ulong get_sdram_size(bd_t *bd)
*/
static void set_eth_mac_addr(bd_t *bd)
{
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
char nvram_eth[6];
ulong eth_lsb, eth_msb;
volatile ulong *mac_reg;
char eth_str[18] = {0}; /* in the form 11:22:33:44:55:66, i.e. with ':' delimiters */
/* We will access to NVRAM through SPI direct access */
- nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* SPI direct can access to flash only through 32bits */
eth_lsb = *((uint32_t*)nvram->eth_address);
@@ -147,10 +147,10 @@ int board_init (void)
int board_late_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
/* Now printf is allowed we can print an eventually NVRAM error */
- nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
if((gd->bd->bi_nvram_addr & 0xFF000000) != PHYS_FLASH_SPI_1)
{
printf("No NVRAM Found\n");
diff --git a/cleopatre/u-boot-1.1.6/board/arizona/flash_spi.c b/cleopatre/u-boot-1.1.6/board/arizona/flash_spi.c
index 5ad659481d..0e2d7ec16f 100644
--- a/cleopatre/u-boot-1.1.6/board/arizona/flash_spi.c
+++ b/cleopatre/u-boot-1.1.6/board/arizona/flash_spi.c
@@ -229,7 +229,7 @@ ulong flash_init_spi (void)
unsigned int flash_nb_blocks, sector;
unsigned int start_address;
OrgDef *pOrgDef;
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
OrgDef OrgSPIFlash = {128, 64*1024}; /* init with default value */
uint32_t flash_org;
@@ -239,7 +239,7 @@ ulong flash_init_spi (void)
init_spi_controller();
/* use parameters from nvram */
- nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
flash_org = nvram->flash_org;
OrgSPIFlash.sector_number = 1 << NVRAM_BFEXT(FLASH_NB_SECT, flash_org);
diff --git a/cleopatre/u-boot-1.1.6/board/sdk300/flash.c b/cleopatre/u-boot-1.1.6/board/sdk300/flash.c
index 571d8246e6..ec9c785d4d 100644
--- a/cleopatre/u-boot-1.1.6/board/sdk300/flash.c
+++ b/cleopatre/u-boot-1.1.6/board/sdk300/flash.c
@@ -317,7 +317,7 @@ ulong flash_init (void)
unsigned int flash_nb_blocks, sector;
unsigned int start_address;
OrgDef *pOrgDef;
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
OrgDef OrgSPIFlash = {128, 64*1024}; /* init with default value */
uint32_t flash_org;
@@ -327,7 +327,7 @@ ulong flash_init (void)
init_spi_controller();
/* use parameters from nvram */
- nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
flash_org = nvram->flash_org;
OrgSPIFlash.sector_number = 1 << NVRAM_BFEXT(FLASH_NB_SECT, flash_org);
diff --git a/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c b/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
index 1ddd0af416..9ecc436615 100644
--- a/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
+++ b/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
@@ -41,9 +41,9 @@ void show_boot_progress(int progress)
*/
ulong get_sdram_size(bd_t *bd)
{
- spc300_nvram_t *nvram;
+ spidcom_nvram_t *nvram;
/* We will access to NVRAM through SPI direct access */
- nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
#if defined (CONFIG_CHIP_FEATURE_SDRAM_CTRL)
ulong sconr;
ulong row, col, bank, byte;
@@ -71,14 +71,14 @@ ulong get_sdram_size(bd_t *bd)
*/
static void set_eth_mac_addr(bd_t *bd)
{
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
char nvram_eth[6];
ulong eth_lsb, eth_msb;
volatile ulong *mac_reg;
char eth_str[18] = {0}; /* in the form 11:22:33:44:55:66, i.e. with ':' delimiters */
/* We will access to NVRAM through SPI direct access */
- nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* SPI direct can access to flash only through 32bits */
eth_lsb = *((uint32_t*)nvram->eth_address);
@@ -172,10 +172,10 @@ int board_init (void)
int board_late_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
/* Now printf is allowed we can print an eventually NVRAM error */
- nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
if((gd->bd->bi_nvram_addr & 0xFF000000) != PHYS_FLASH_SPI_1)
{
printf("No NVRAM Found\n");
diff --git a/cleopatre/u-boot-1.1.6/common/cmd_misc.c b/cleopatre/u-boot-1.1.6/common/cmd_misc.c
index f0f21215d4..fe66e6e823 100644
--- a/cleopatre/u-boot-1.1.6/common/cmd_misc.c
+++ b/cleopatre/u-boot-1.1.6/common/cmd_misc.c
@@ -36,7 +36,7 @@ static ulong get_timer_clock(void)
{
DECLARE_GLOBAL_DATA_PTR;
bd_t *bd = gd->bd;
- spc300_nvram_t *nvram = (spc300_nvram_t*)bd->bi_nvram_addr;
+ spidcom_nvram_t *nvram = (spidcom_nvram_t*)bd->bi_nvram_addr;
ulong timerclk;
switch(NVRAM_BFEXT(XCLK, nvram->pkg_cfg))
diff --git a/cleopatre/u-boot-1.1.6/common/cmd_spidboot.c b/cleopatre/u-boot-1.1.6/common/cmd_spidboot.c
index ed788e51a2..77b7736cb3 100644
--- a/cleopatre/u-boot-1.1.6/common/cmd_spidboot.c
+++ b/cleopatre/u-boot-1.1.6/common/cmd_spidboot.c
@@ -421,7 +421,7 @@ static int select_image(int img_nb)
static ulong
find_nb_images (void)
{
- spc300_nvram_t *nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
/* We can use SPI Direct Access because nb_images is a uint32_t */
return nvram->nb_images;
@@ -430,7 +430,7 @@ find_nb_images (void)
static ulong
find_image_start_addr (void)
{
- spc300_nvram_t *nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
/* We can use SPI Direct Access because nb_images is a uint32_t */
return PHYS_FLASH_SPI_1 + nvram->img_0_offset;
@@ -439,7 +439,7 @@ find_image_start_addr (void)
static ulong
find_image_max_size (void)
{
- spc300_nvram_t *nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
/* We can use SPI Direct Access because nb_images is a uint32_t */
return nvram->img_max_size;
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/serial.c b/cleopatre/u-boot-1.1.6/cpu/spc300/serial.c
index b503c4a611..ac21345966 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/serial.c
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/serial.c
@@ -38,7 +38,7 @@ int get_master_clock(gd_t* gd)
masterclk = CONFIG_CHIP_MAX_MASTER_CLOCK;
#else
bd_t *bd = gd->bd;
- spc300_nvram_t *nvram = (spc300_nvram_t*)bd->bi_nvram_addr;
+ spidcom_nvram_t *nvram = (spidcom_nvram_t*)bd->bi_nvram_addr;
switch(NVRAM_BFEXT(FREQ, nvram->pkg_cfg))
{
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/wdt.c b/cleopatre/u-boot-1.1.6/cpu/spc300/wdt.c
index 75b5ee63cc..270984f443 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/wdt.c
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/wdt.c
@@ -39,7 +39,7 @@ static int get_master_clock(void)
#else
DECLARE_GLOBAL_DATA_PTR;
bd_t *bd = gd->bd;
- spc300_nvram_t *nvram = (spc300_nvram_t*)bd->bi_nvram_addr;
+ spidcom_nvram_t *nvram = (spidcom_nvram_t*)bd->bi_nvram_addr;
switch(NVRAM_BFEXT(FREQ, nvram->pkg_cfg))
{
diff --git a/cleopatre/u-boot-1.1.6/drivers/netspcmac_eth.c b/cleopatre/u-boot-1.1.6/drivers/netspcmac_eth.c
index 0fc8162768..584216ee4a 100644
--- a/cleopatre/u-boot-1.1.6/drivers/netspcmac_eth.c
+++ b/cleopatre/u-boot-1.1.6/drivers/netspcmac_eth.c
@@ -289,7 +289,7 @@ int spcmac_phy_reset (int phy_addr, unsigned long phy_id)
/* Fix hardware bug */
{
DECLARE_GLOBAL_DATA_PTR;
- spc300_nvram_t *nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
if((NVRAM_BFEXT(ETH_MODE, nvram->pkg_cfg) == NVRAM_ETH_MODE_GMII) &&
(PHYSID_GET_OUI (phy_id) == ICPLUS_OUI) &&
@@ -305,10 +305,10 @@ static unsigned int spcmac_phy_get_addr (void)
{
#ifdef CONFIG_ARCH_SPC300
DECLARE_GLOBAL_DATA_PTR;
- spc300_nvram_t *nvram = NULL;
+ spidcom_nvram_t *nvram = NULL;
//Get PHY address directly from NVRAM
- nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
return (nvram->eth_phy_addr > 31 ? 0 : nvram->eth_phy_addr);
#else
int i, phyaddr;
@@ -672,7 +672,7 @@ static void spcmac_set_rb_mii_cap (unsigned int speed)
unsigned int eth_cfg;
unsigned int rmii_clk;
DECLARE_GLOBAL_DATA_PTR;
- spc300_nvram_t *nvram = (spc300_nvram_t *)(gd->bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(gd->bd->bi_nvram_addr);
unsigned int mode = NVRAM_BFEXT(ETH_MODE, nvram->pkg_cfg);
if(mode == NVRAM_ETH_MODE_GMII) /* GMII */
diff --git a/cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3/nvram.h b/cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3/nvram.h
index 254cffac1d..9cf683c6c1 100644
--- a/cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3/nvram.h
+++ b/cleopatre/u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3/nvram.h
@@ -51,6 +51,6 @@ typedef struct
char device_password[32]; // HomePlugAV device unique password (DPW)
char oem_info[64]; // Additional information for OEM
unsigned char tonemask[192]; // HomePlugAV tonemask
-} spc300_nvram_t; //Currently __attribute__((packed)) not needed
+} spidcom_nvram_t; //Currently __attribute__((packed)) not needed
#endif /* __ASM_ARCH_SPC300_NVRAM_H */
diff --git a/cleopatre/u-boot-1.1.6/net/spidupd.c b/cleopatre/u-boot-1.1.6/net/spidupd.c
index 812bc3aa9c..e0b933ce9e 100644
--- a/cleopatre/u-boot-1.1.6/net/spidupd.c
+++ b/cleopatre/u-boot-1.1.6/net/spidupd.c
@@ -227,7 +227,7 @@ static int check_img(spidcom_image_desc_t *desc)
static __inline__ ulong find_img_max_size(bd_t *bd)
{
/* First image address is stored under NVRAM */
- spc300_nvram_t *nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* We can use SPI Direct Access because image_max_size is a uint32_t */
return nvram->img_max_size;
@@ -242,7 +242,7 @@ static __inline__ ulong find_img_max_size(bd_t *bd)
static __inline__ ulong find_img_1st_offset(bd_t *bd)
{
/* First image address is stored under NVRAM */
- spc300_nvram_t *nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* We can use SPI Direct Access because nb_images is a uint32_t */
return nvram->img_0_offset;
@@ -257,7 +257,7 @@ static __inline__ ulong find_img_1st_offset(bd_t *bd)
static __inline__ ulong find_nb_images(bd_t* bd)
{
/* Number of allowed images is stored under NVRAM */
- spc300_nvram_t *nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* We can use SPI Direct Access because nb_images is a uint32_t */
return nvram->nb_images;
@@ -275,7 +275,7 @@ static __inline__ void find_mac_addresses(bd_t* bd, unsigned char eth[6], unsign
ulong lsb, msb;
/* Number of allowed images is stored under NVRAM */
- spc300_nvram_t *nvram = (spc300_nvram_t *)(bd->bi_nvram_addr);
+ spidcom_nvram_t *nvram = (spidcom_nvram_t *)(bd->bi_nvram_addr);
/* SPI direct can access to flash only through 32bits */
lsb = *((uint32_t*)nvram->eth_address);