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/common/cmd_misc.c | 2 +- cleopatre/u-boot-1.1.6/common/cmd_spidboot.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cleopatre/u-boot-1.1.6/common') 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; -- cgit v1.2.3