summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/application/cwmp/src/impl_get.c4
-rw-r--r--cleopatre/application/cwmp/src/utils.c2
-rw-r--r--cleopatre/application/libspid/inc/libspid.h2
-rw-r--r--cleopatre/application/libspid/src/image.c4
-rw-r--r--cleopatre/application/libspid/src/system.c4
-rw-r--r--cleopatre/devkit/plcd/inc/plcd.h2
-rw-r--r--cleopatre/devkit/plcd/src/plcd_main.c2
-rw-r--r--cleopatre/devkit/plcdrv/src/plcdrv.c4
-rw-r--r--cleopatre/devkit/tests/libspid/ftests/src/spidlib_ftests.c2
-rw-r--r--cleopatre/devkit/tests/libspid/utests/src/system_utests.c12
-rw-r--r--cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c2
-rw-r--r--cleopatre/devkit/tests/plcdrv/utests/stub/linux/inc/asm/arch/nvram.h4
-rw-r--r--cleopatre/devkit/tests/plcdrv/utests/stub/linux/src/spc300.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c8
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c6
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c8
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c4
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c4
-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
-rw-r--r--common/include/asm/arch/nvram.h6
30 files changed, 72 insertions, 72 deletions
diff --git a/cleopatre/application/cwmp/src/impl_get.c b/cleopatre/application/cwmp/src/impl_get.c
index 6e6dcbbad9..7f7dba8376 100644
--- a/cleopatre/application/cwmp/src/impl_get.c
+++ b/cleopatre/application/cwmp/src/impl_get.c
@@ -33,8 +33,8 @@
static char impl_device_deviceinfo_manufactureroui[CWMP_PARAM_SIZE_DEVICE_DEVICEINFO_MANUFACTUREROUI] = ""; /* filled later */
static char impl_device_deviceinfo_softwareversion[CWMP_PARAM_SIZE_DEVICE_DEVICEINFO_SOFTWAREVERSION] = ""; /* filled later */
-static spc300_nvram_t cached_nvram; /* cache until the app ends. */
-static spc300_nvram_t *nvram;
+static spidcom_nvram_t cached_nvram; /* cache until the app ends. */
+static spidcom_nvram_t *nvram;
static struct utils_net_if_stats cached_ethernet_if_stats; /* cache for one session */
static struct utils_net_if_stats *ethernet_if_stats;
diff --git a/cleopatre/application/cwmp/src/utils.c b/cleopatre/application/cwmp/src/utils.c
index 7e76db0e66..95eb9d836c 100644
--- a/cleopatre/application/cwmp/src/utils.c
+++ b/cleopatre/application/cwmp/src/utils.c
@@ -214,7 +214,7 @@ utils_get_oui(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
return UTILS_STATUS_ERROR;
}
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
libspid_error_t status = libspid_system_get_nvram(&nvram);
if (status != LIBSPID_SUCCESS)
{
diff --git a/cleopatre/application/libspid/inc/libspid.h b/cleopatre/application/libspid/inc/libspid.h
index 05ad748da8..3585103a7f 100644
--- a/cleopatre/application/libspid/inc/libspid.h
+++ b/cleopatre/application/libspid/inc/libspid.h
@@ -157,7 +157,7 @@ extern void libspid_system_reboot(void);
extern libspid_error_t libspid_system_save(void);
extern libspid_error_t libspid_system_save_file(const char *filename);
extern libspid_error_t libspid_system_factory(void);
-extern libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram);
+extern libspid_error_t libspid_system_get_nvram(spidcom_nvram_t *nvram);
extern libspid_error_t libspid_system_file_update_register (pid_t rx_pid, const char *filename, const libspid_signal_handler_t callback);
extern libspid_error_t libspid_system_file_update_unregister (pid_t rx_pid, const char *filename);
extern libspid_error_t libspid_system_file_update_is_registered (pid_t rx_pid, const char *filename, libspid_boolean_t *is_registered);
diff --git a/cleopatre/application/libspid/src/image.c b/cleopatre/application/libspid/src/image.c
index 9994c53619..2c7f9b7326 100644
--- a/cleopatre/application/libspid/src/image.c
+++ b/cleopatre/application/libspid/src/image.c
@@ -57,7 +57,7 @@ libspid_error_t libspid_image_get_desc(libspid_image_desc_type_t type, spidcom_i
int img_desc_1_found = 0;
FILE *fp;
char *img_desc_mtd_num;
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
if ( (image_desc == NULL) || (mtd_name == NULL) )
{
@@ -286,7 +286,7 @@ libspid_error_t libspid_image_select(libspid_image_select_t select)
unsigned char *sector_data;
//region_info_t reginfo;
//char cmd_buffer[256];
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
#ifndef __UTESTS__
volatile mtd_info_t meminfo;
erase_info_t erase;
diff --git a/cleopatre/application/libspid/src/system.c b/cleopatre/application/libspid/src/system.c
index 5505ff67ac..2020a052c2 100644
--- a/cleopatre/application/libspid/src/system.c
+++ b/cleopatre/application/libspid/src/system.c
@@ -457,7 +457,7 @@ libspid_error_t libspid_system_factory(void)
* \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram)
+libspid_error_t libspid_system_get_nvram(spidcom_nvram_t *nvram)
{
FILE *fp;
int fd;
@@ -503,7 +503,7 @@ libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram)
return LIBSPID_ERROR_SYSTEM;
}
- if( read(fd, nvram, sizeof(spc300_nvram_t)) < (int)sizeof(spc300_nvram_t) )
+ if( read(fd, nvram, sizeof(spidcom_nvram_t)) < (int)sizeof(spidcom_nvram_t) )
{
close(fd);
return LIBSPID_ERROR_SYSTEM;
diff --git a/cleopatre/devkit/plcd/inc/plcd.h b/cleopatre/devkit/plcd/inc/plcd.h
index 1248f3f037..d5180bcb67 100644
--- a/cleopatre/devkit/plcd/inc/plcd.h
+++ b/cleopatre/devkit/plcd/inc/plcd.h
@@ -120,7 +120,7 @@ typedef struct
/** plcd netlink address descriptor for PLC driver comm */
struct sockaddr_nl plcd_addr;
/** NVRAM structure */
- spc300_nvram_t *nvram;
+ spidcom_nvram_t *nvram;
/** indicates if configuration files have to be saved in flash */
libspid_boolean_t is_save_conf_needed;
/** indicates if other processes have to be informed about files modifications */
diff --git a/cleopatre/devkit/plcd/src/plcd_main.c b/cleopatre/devkit/plcd/src/plcd_main.c
index 4145900ecc..679e966f84 100644
--- a/cleopatre/devkit/plcd/src/plcd_main.c
+++ b/cleopatre/devkit/plcd/src/plcd_main.c
@@ -37,7 +37,7 @@
# include "plcd_utests.h"
#endif /* __UTESTS__ */
-static spc300_nvram_t g_nvram;
+static spidcom_nvram_t g_nvram;
volatile sig_atomic_t is_process_signal_needed;
diff --git a/cleopatre/devkit/plcdrv/src/plcdrv.c b/cleopatre/devkit/plcdrv/src/plcdrv.c
index 6167d66008..67466f2439 100644
--- a/cleopatre/devkit/plcdrv/src/plcdrv.c
+++ b/cleopatre/devkit/plcdrv/src/plcdrv.c
@@ -912,8 +912,8 @@ plcdrv_init (struct net_device *dev)
netif_napi_add (dev, &priv->napi, ipmbox_receive, IPMBOX_RX_BUDGET);
/* Setup MAC address for Linux (stored in NVRAM). */
- memcpy (dev->dev_addr, spc300_nvram.plc_address,
- ARRAY_SIZE (spc300_nvram.plc_address));
+ memcpy (dev->dev_addr, spidcom_nvram.plc_address,
+ ARRAY_SIZE (spidcom_nvram.plc_address));
/* Initialize structure for poll/select management. */
init_waitqueue_head (&priv->wd.wq);
diff --git a/cleopatre/devkit/tests/libspid/ftests/src/spidlib_ftests.c b/cleopatre/devkit/tests/libspid/ftests/src/spidlib_ftests.c
index 9ff0eb4d30..7a23f8b0ad 100644
--- a/cleopatre/devkit/tests/libspid/ftests/src/spidlib_ftests.c
+++ b/cleopatre/devkit/tests/libspid/ftests/src/spidlib_ftests.c
@@ -32,7 +32,7 @@ int main()
char *elt2 = "Three";
unsigned int total_s;
unsigned int idle_s;
- spc300_nvram_t nvram;
+ spidcom_nvram_t nvram;
libspid_ip_t ip;
unsigned char mac[32];
char mtd_name[32];
diff --git a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
index 6028332547..57af71b273 100644
--- a/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
+++ b/cleopatre/devkit/tests/libspid/utests/src/system_utests.c
@@ -373,14 +373,14 @@ END_TEST
START_TEST (test_libspid_system_get_nvram)
{
- static spc300_nvram_t nvram;
- static spc300_nvram_t ret_nvram;
+ static spidcom_nvram_t nvram;
+ static spidcom_nvram_t ret_nvram;
int ret;
FILE *fp;
char nvram_path[128] = {0};
/* initialize nvram struct */
- memset( &nvram, 0x0, sizeof(spc300_nvram_t) );
+ memset( &nvram, 0x0, sizeof(spidcom_nvram_t) );
strcpy( nvram.magic, SPC300_NVRAM_MAGIC); /* magic number "NVRAM\0\0\0" */
nvram.pkg_cfg = 0x123; /* SPC300 package configuration register */
nvram.gpio_0_7_cfg = 0x45; /* SPC300 GPIO 0 to 7 configuration register */
@@ -403,15 +403,15 @@ START_TEST (test_libspid_system_get_nvram)
exit(EXIT_FAILURE);
}
- fwrite( &nvram, sizeof(spc300_nvram_t), 1, fp );
+ fwrite( &nvram, sizeof(spidcom_nvram_t), 1, fp );
fclose(fp); /* flushes I/O buffer into the file */
- memset( &ret_nvram, 0x0, sizeof(spc300_nvram_t) );
+ memset( &ret_nvram, 0x0, sizeof(spidcom_nvram_t) );
ret = libspid_system_get_nvram(&ret_nvram);
fail_if(ret != LIBSPID_SUCCESS, "libspid_system_get_nvram fail");
- ret = memcmp ( &ret_nvram, &nvram, sizeof(spc300_nvram_t) );
+ ret = memcmp ( &ret_nvram, &nvram, sizeof(spidcom_nvram_t) );
fail_if(ret != 0, "libspid_system_get_nvram gets wrong nvram");
#ifdef DEBUG
diff --git a/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c b/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c
index 4eb9f55142..460f43c5fe 100644
--- a/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c
+++ b/cleopatre/devkit/tests/managerd/utests/override/src/libspid_stub.c
@@ -41,7 +41,7 @@ static char value_table[2][MAX_ITEM_NB][64];
* line to read
* \return LIBSPID_ERROR_SYSTEM: system error, see errno
*/
-libspid_error_t libspid_system_get_nvram(spc300_nvram_t *nvram)
+libspid_error_t libspid_system_get_nvram(spidcom_nvram_t *nvram)
{
if (nvram == NULL)
return LIBSPID_ERROR_PARAM;
diff --git a/cleopatre/devkit/tests/plcdrv/utests/stub/linux/inc/asm/arch/nvram.h b/cleopatre/devkit/tests/plcdrv/utests/stub/linux/inc/asm/arch/nvram.h
index 180868a766..a15e10b8c5 100644
--- a/cleopatre/devkit/tests/plcdrv/utests/stub/linux/inc/asm/arch/nvram.h
+++ b/cleopatre/devkit/tests/plcdrv/utests/stub/linux/inc/asm/arch/nvram.h
@@ -30,8 +30,8 @@ typedef struct
char manufactory_info[64]; // Name of the product manufacturer
uint32_t img_max_size; // Max size of an image in flash
uint32_t cpu_partnb; // SPC3x0 partnb
-} spc300_nvram_t; //Currently __attribute__((packed)) not needed
+} spidcom_nvram_t; //Currently __attribute__((packed)) not needed
-extern spc300_nvram_t spc300_nvram;
+extern spidcom_nvram_t spidcom_nvram;
#endif /* stub_linux_inc_linux_asm_arch_nvram_h */
diff --git a/cleopatre/devkit/tests/plcdrv/utests/stub/linux/src/spc300.c b/cleopatre/devkit/tests/plcdrv/utests/stub/linux/src/spc300.c
index eb3420b098..38ce89e223 100644
--- a/cleopatre/devkit/tests/plcdrv/utests/stub/linux/src/spc300.c
+++ b/cleopatre/devkit/tests/plcdrv/utests/stub/linux/src/spc300.c
@@ -1,6 +1,6 @@
#include <linux/types.h>
#include <asm/arch/nvram.h>
-spc300_nvram_t spc300_nvram;
+spidcom_nvram_t spidcom_nvram;
uint32_t spc300_plc_mem_start;
uint32_t spc300_plc_mem_size;
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
index f2086f3cf8..a242279714 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
@@ -269,15 +269,15 @@ spc300_gpio_one_setup (int num)
chip->direction_output = NULL;
if (num < MIN_INTERNAL_GPIOS)
- gpio_config = ((spc300_nvram.gpio_0_7_cfg >> (num * 4)) & 0xF);
+ gpio_config = ((spidcom_nvram.gpio_0_7_cfg >> (num * 4)) & 0xF);
else
- gpio_config = ((spc300_nvram.gpio_8_15_cfg >> ((num-MIN_INTERNAL_GPIOS) * 4)) & 0xF);
+ gpio_config = ((spidcom_nvram.gpio_8_15_cfg >> ((num-MIN_INTERNAL_GPIOS) * 4)) & 0xF);
/* Check if gpio_config is ARM gpios */
if (gpio_config == 0)
{
/* check allowed direction */
- switch (spc300_gpio_direction (spc300_nvram.gpio_allow_dir, num))
+ switch (spc300_gpio_direction (spidcom_nvram.gpio_allow_dir, num))
{
case SPC300_GPIO_DIRECTION_BIDIR:
chip->get = &spc300_gpio_get_value;
@@ -309,7 +309,7 @@ spc300_gpio_setup (void)
int i;
/* Register allowed gpios through gpio_lib */
- for (i=0 ; i<spc300_gpio_max_nb (spc300_nvram.pkg_cfg); i++)
+ for (i=0 ; i<spc300_gpio_max_nb (spidcom_nvram.pkg_cfg); i++)
{
spc300_gpio_one_setup (i);
}
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
index 2c2e049606..e9155f65e7 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c
@@ -389,11 +389,11 @@ void __init spc300_add_device_uart1(void)
void spc300_add_device_ethernet(void)
{
//Find MAC address from NVRAM
- memcpy(&spc300_ethernet_data.mac_addr, spc300_nvram.eth_address, sizeof(spc300_nvram.eth_address));
+ memcpy(&spc300_ethernet_data.mac_addr, spidcom_nvram.eth_address, sizeof(spidcom_nvram.eth_address));
//Find Eth phy connection from NVRAM
//TODO:use NVRAM defines
- switch((spc300_nvram.pkg_cfg & 0x00000300)>>8)
+ switch((spidcom_nvram.pkg_cfg & 0x00000300)>>8)
{
case 1: //RMII
spc300_ethernet_data.support_mii = 0;
@@ -412,7 +412,7 @@ void spc300_add_device_ethernet(void)
}
//Find PHY address from NVRAM
- spc300_ethernet_data.phy_addr = spc300_nvram.eth_phy_addr;
+ spc300_ethernet_data.phy_addr = spidcom_nvram.eth_phy_addr;
//Register Ethernet device
platform_device_register(&spc300_ethernet_device);
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
index 115193a546..7e7bdfe231 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300.c
@@ -81,8 +81,8 @@ static struct map_desc spc300_nvram_io_desc;
static struct map_desc spc300_plccode_io_desc;
/** Global NVRAM address */
-spc300_nvram_t spc300_nvram;
-EXPORT_SYMBOL(spc300_nvram);
+spidcom_nvram_t spidcom_nvram;
+EXPORT_SYMBOL(spidcom_nvram);
/** Physical address of the start of the memory dedicated to PLC. */
uint32_t spc300_plc_mem_start = 0;
@@ -266,7 +266,7 @@ void __init spc300_map_io(void)
//Set NVRAM mapping and copy it because direct access only accept word read
iotable_init(&spc300_nvram_io_desc, 1);
- spc300_nvram_copy((void*)&spc300_nvram, (void*)spc300_nvram_io_desc.virtual, sizeof(spc300_nvram_t));
+ spidcom_nvram_copy((void*)&spidcom_nvram, (void*)spc300_nvram_io_desc.virtual, sizeof(spidcom_nvram_t));
//Set PLC code mapping
iotable_init(&spc300_plccode_io_desc, 1);
@@ -305,7 +305,7 @@ void spc300_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, s
//Set NVRAM mapping
spc300_nvram_io_desc.virtual = IO_ADDRESS(SPI_BASE_DIR) + nvram_offset;
spc300_nvram_io_desc.pfn = __phys_to_pfn(SPI_BASE_DIR + nvram_offset);
- spc300_nvram_io_desc.length = sizeof(spc300_nvram_t);
+ spc300_nvram_io_desc.length = sizeof(spidcom_nvram_t);
spc300_nvram_io_desc.type = MT_DEVICE;
//Set PLC code mapping
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c b/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
index caa9dd85ce..849dd4ef2b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
@@ -757,10 +757,10 @@ __init spc300_gpio_probe (struct platform_device *pdev)
}
/* Setup GPIO interrupts */
- for (num = 0; num < spc300_gpio_max_nb (spc300_nvram.pkg_cfg); num++)
+ for (num = 0; num < spc300_gpio_max_nb (spidcom_nvram.pkg_cfg); num++)
{
if (SPC300_GPIO_DIRECTION_INPUT == \
- spc300_gpio_direction (spc300_nvram.gpio_allow_dir, num))
+ spc300_gpio_direction (spidcom_nvram.gpio_allow_dir, num))
spc300_gpio_set_interrupt (num, 1, 1);
}
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c b/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
index da13634707..f1dd15e25f 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
@@ -653,10 +653,10 @@ static int __devinit m25p_probe(struct spi_device *spi)
#ifdef CONFIG_ARCH_SPC300
{
m25pgeneric.n_sectors =
- (1 << NVRAM_BFEXT (FLASH_NB_SECT, spc300_nvram.flash_org));
+ (1 << NVRAM_BFEXT (FLASH_NB_SECT, spidcom_nvram.flash_org));
m25pgeneric.sector_size =
((64 * 1024) *
- (NVRAM_BFEXT (FLASH_SECT_SZ, spc300_nvram.flash_org) + 1));
+ (NVRAM_BFEXT (FLASH_SECT_SZ, spidcom_nvram.flash_org) + 1));
info = &m25pgeneric;
dev_warn(&spi->dev,
"Using flash architecture given by NVRAM (%u sectors of %uKBytes)\n",
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);
diff --git a/common/include/asm/arch/nvram.h b/common/include/asm/arch/nvram.h
index 629aa5cc7f..0ef00addcc 100644
--- a/common/include/asm/arch/nvram.h
+++ b/common/include/asm/arch/nvram.h
@@ -82,7 +82,7 @@ typedef struct
uint32_t img_max_size; // Max size of an image in flash
uint32_t cpu_partnb; // SPC3x0 partnb
uint32_t dynamic[256]; // Dynamic data (see miu_config)
-} spc300_nvram_t; //Currently __attribute__((packed)) not needed
+} spidcom_nvram_t; //Currently __attribute__((packed)) not needed
// Bitfields for flash organization
#define NVRAM_FLASH_NB_SECT_SHIFT 0
@@ -102,9 +102,9 @@ typedef struct
| NVRAM_BF(name,value))
#ifdef __KERNEL__
-extern spc300_nvram_t spc300_nvram;
+extern spidcom_nvram_t spidcom_nvram;
-static inline void spc300_nvram_copy(void* dst, void* src, unsigned int length)
+static inline void spidcom_nvram_copy(void* dst, void* src, unsigned int length)
{
unsigned int burst, rest, i;
unsigned long *src32, *dst32;