From 7bc5e92c16dc75b9afe13535010c153e3024412d Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Wed, 8 Aug 2012 11:36:23 +0200 Subject: {cleo, common}: rename spc300_nvram into spidcom_nvram, refs #3119 This is done to use common NVRAM structure and variable names with polux. --- cleopatre/u-boot-1.1.6/board/sdk300/flash.c | 4 ++-- cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cleopatre/u-boot-1.1.6/board/sdk300') 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"); -- cgit v1.2.3