summaryrefslogtreecommitdiff
path: root/cleopatre/u-boot-1.1.6/common
diff options
context:
space:
mode:
authorCyril Jourdan2012-08-08 11:36:23 +0200
committerCyril Jourdan2012-09-20 10:25:34 +0200
commit7bc5e92c16dc75b9afe13535010c153e3024412d (patch)
treebfe5395814a90908226b1a5f231676f902632f1a /cleopatre/u-boot-1.1.6/common
parentd0de9b685d1966d015cb1289e81ea77aa72f607a (diff)
{cleo, common}: rename spc300_nvram into spidcom_nvram, refs #3119
This is done to use common NVRAM structure and variable names with polux.
Diffstat (limited to 'cleopatre/u-boot-1.1.6/common')
-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
2 files changed, 4 insertions, 4 deletions
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;