GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 19:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fpga: spartan2: Avoid CamelCase

Browse source 
No functional changes.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2014-03-13 11:23:43 +01:00
parent 69c0d323e3
commit b625b9aef3
6 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/esd/pmc440/fpga.c
View file

@ -47,7 +47,7 @@ Xilinx_Spartan3_Slave_Serial_fns pmc440_fpga_fns = {
}; };
#endif #endif
Xilinx_Spartan2_Slave_Serial_fns ngcc_fpga_fns = { xilinx_spartan2_slave_serial_fns ngcc_fpga_fns = {
ngcc_fpga_pre_config_fn, ngcc_fpga_pre_config_fn,
ngcc_fpga_pgm_fn, ngcc_fpga_pgm_fn,
ngcc_fpga_clk_fn, ngcc_fpga_clk_fn,

2
board/matrix_vision/mvsmr/fpga.c
View file

@ -27,7 +27,7 @@ Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
}; };
Xilinx_desc spartan3 = { Xilinx_desc spartan3 = {
Xilinx_Spartan2, xilinx_spartan2,
slave_serial, slave_serial,
XILINX_XC3S200_SIZE, XILINX_XC3S200_SIZE,
(void *) &fpga_fns, (void *) &fpga_fns,

40
drivers/fpga/spartan2.c
View file

@ -31,29 +31,29 @@
#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100 /* 10 ms */ #define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/100 /* 10 ms */
#endif #endif
static int Spartan2_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize); static int spartan2_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize);
static int Spartan2_sp_dump(Xilinx_desc *desc, const void *buf, size_t bsize); static int spartan2_sp_dump(Xilinx_desc *desc, const void *buf, size_t bsize);
/* static int Spartan2_sp_info(Xilinx_desc *desc ); */ /* static int spartan2_sp_info(Xilinx_desc *desc ); */
static int Spartan2_ss_load(Xilinx_desc *desc, const void *buf, size_t bsize); static int spartan2_ss_load(Xilinx_desc *desc, const void *buf, size_t bsize);
static int Spartan2_ss_dump(Xilinx_desc *desc, const void *buf, size_t bsize); static int spartan2_ss_dump(Xilinx_desc *desc, const void *buf, size_t bsize);
/* static int Spartan2_ss_info(Xilinx_desc *desc ); */ /* static int spartan2_ss_info(Xilinx_desc *desc ); */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Spartan-II Generic Implementation */ /* Spartan-II Generic Implementation */
int Spartan2_load(Xilinx_desc *desc, const void *buf, size_t bsize) int spartan2_load(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; int ret_val = FPGA_FAIL;
switch (desc->iface) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF ("%s: Launching Slave Serial Load\n", __FUNCTION__); PRINTF ("%s: Launching Slave Serial Load\n", __FUNCTION__);
ret_val = Spartan2_ss_load (desc, buf, bsize); ret_val = spartan2_ss_load(desc, buf, bsize);
break; break;
case slave_parallel: case slave_parallel:
PRINTF ("%s: Launching Slave Parallel Load\n", __FUNCTION__); PRINTF ("%s: Launching Slave Parallel Load\n", __FUNCTION__);
ret_val = Spartan2_sp_load (desc, buf, bsize); ret_val = spartan2_sp_load(desc, buf, bsize);
break; break;
default: default:
@ -64,19 +64,19 @@ int Spartan2_load(Xilinx_desc *desc, const void *buf, size_t bsize)
return ret_val; return ret_val;
} }
int Spartan2_dump(Xilinx_desc *desc, const void *buf, size_t bsize) int spartan2_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; int ret_val = FPGA_FAIL;
switch (desc->iface) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF ("%s: Launching Slave Serial Dump\n", __FUNCTION__); PRINTF ("%s: Launching Slave Serial Dump\n", __FUNCTION__);
ret_val = Spartan2_ss_dump (desc, buf, bsize); ret_val = spartan2_ss_dump(desc, buf, bsize);
break; break;
case slave_parallel: case slave_parallel:
PRINTF ("%s: Launching Slave Parallel Dump\n", __FUNCTION__); PRINTF ("%s: Launching Slave Parallel Dump\n", __FUNCTION__);
ret_val = Spartan2_sp_dump (desc, buf, bsize); ret_val = spartan2_sp_dump(desc, buf, bsize);
break; break;
default: default:
@ -87,7 +87,7 @@ int Spartan2_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
return ret_val; return ret_val;
} }
int Spartan2_info( Xilinx_desc *desc ) int spartan2_info(Xilinx_desc *desc)
{ {
return FPGA_SUCCESS; return FPGA_SUCCESS;
} }
@ -96,10 +96,10 @@ int Spartan2_info( Xilinx_desc *desc )
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Spartan-II Slave Parallel Generic Implementation */ /* Spartan-II Slave Parallel Generic Implementation */
static int Spartan2_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize) static int spartan2_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; /* assume the worst */ int ret_val = FPGA_FAIL; /* assume the worst */
Xilinx_Spartan2_Slave_Parallel_fns *fn = desc->iface_fns; xilinx_spartan2_slave_parallel_fns *fn = desc->iface_fns;
PRINTF ("%s: start with interface functions @ 0x%p\n", PRINTF ("%s: start with interface functions @ 0x%p\n",
__FUNCTION__, fn); __FUNCTION__, fn);
@ -248,10 +248,10 @@ static int Spartan2_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize)
return ret_val; return ret_val;
} }
static int Spartan2_sp_dump(Xilinx_desc *desc, const void *buf, size_t bsize) static int spartan2_sp_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; /* assume the worst */ int ret_val = FPGA_FAIL; /* assume the worst */
Xilinx_Spartan2_Slave_Parallel_fns *fn = desc->iface_fns; xilinx_spartan2_slave_parallel_fns *fn = desc->iface_fns;
if (fn) { if (fn) {
unsigned char *data = (unsigned char *) buf; unsigned char *data = (unsigned char *) buf;
@ -296,10 +296,10 @@ static int Spartan2_sp_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static int Spartan2_ss_load(Xilinx_desc *desc, const void *buf, size_t bsize) static int spartan2_ss_load(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
int ret_val = FPGA_FAIL; /* assume the worst */ int ret_val = FPGA_FAIL; /* assume the worst */
Xilinx_Spartan2_Slave_Serial_fns *fn = desc->iface_fns; xilinx_spartan2_slave_serial_fns *fn = desc->iface_fns;
int i; int i;
unsigned char val; unsigned char val;
@ -439,7 +439,7 @@ static int Spartan2_ss_load(Xilinx_desc *desc, const void *buf, size_t bsize)
return ret_val; return ret_val;
} }
static int Spartan2_ss_dump(Xilinx_desc *desc, const void *buf, size_t bsize) static int spartan2_ss_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
{ {
/* Readback is only available through the Slave Parallel and */ /* Readback is only available through the Slave Parallel and */
/* boundary-scan interfaces. */ /* boundary-scan interfaces. */

14
drivers/fpga/xilinx.c
View file

@ -149,11 +149,11 @@ int xilinx_load(Xilinx_desc *desc, const void *buf, size_t bsize)
printf ("%s: Invalid device descriptor\n", __FUNCTION__); printf ("%s: Invalid device descriptor\n", __FUNCTION__);
} else } else
switch (desc->family) { switch (desc->family) {
case Xilinx_Spartan2: case xilinx_spartan2:
#if defined(CONFIG_FPGA_SPARTAN2) #if defined(CONFIG_FPGA_SPARTAN2)
PRINTF ("%s: Launching the Spartan-II Loader...\n", PRINTF ("%s: Launching the Spartan-II Loader...\n",
__FUNCTION__); __FUNCTION__);
ret_val = Spartan2_load (desc, buf, bsize); ret_val = spartan2_load(desc, buf, bsize);
#else #else
printf ("%s: No support for Spartan-II devices.\n", printf ("%s: No support for Spartan-II devices.\n",
__FUNCTION__); __FUNCTION__);
@ -206,11 +206,11 @@ int xilinx_dump(Xilinx_desc *desc, const void *buf, size_t bsize)
printf ("%s: Invalid device descriptor\n", __FUNCTION__); printf ("%s: Invalid device descriptor\n", __FUNCTION__);
} else } else
switch (desc->family) { switch (desc->family) {
case Xilinx_Spartan2: case xilinx_spartan2:
#if defined(CONFIG_FPGA_SPARTAN2) #if defined(CONFIG_FPGA_SPARTAN2)
PRINTF ("%s: Launching the Spartan-II Reader...\n", PRINTF ("%s: Launching the Spartan-II Reader...\n",
__FUNCTION__); __FUNCTION__);
ret_val = Spartan2_dump (desc, buf, bsize); ret_val = spartan2_dump(desc, buf, bsize);
#else #else
printf ("%s: No support for Spartan-II devices.\n", printf ("%s: No support for Spartan-II devices.\n",
__FUNCTION__); __FUNCTION__);
@ -262,7 +262,7 @@ int xilinx_info (Xilinx_desc * desc)
if (xilinx_validate (desc, (char *)__FUNCTION__)) { if (xilinx_validate (desc, (char *)__FUNCTION__)) {
printf ("Family: \t"); printf ("Family: \t");
switch (desc->family) { switch (desc->family) {
case Xilinx_Spartan2: case xilinx_spartan2:
printf ("Spartan-II\n"); printf ("Spartan-II\n");
break; break;
case Xilinx_Spartan3: case Xilinx_Spartan3:
@ -316,9 +316,9 @@ int xilinx_info (Xilinx_desc * desc)
if (desc->iface_fns) { if (desc->iface_fns) {
printf ("Device Function Table @ 0x%p\n", desc->iface_fns); printf ("Device Function Table @ 0x%p\n", desc->iface_fns);
switch (desc->family) { switch (desc->family) {
case Xilinx_Spartan2: case xilinx_spartan2:
#if defined(CONFIG_FPGA_SPARTAN2) #if defined(CONFIG_FPGA_SPARTAN2)
Spartan2_info (desc); spartan2_info(desc);
#else #else
/* just in case */ /* just in case */
printf ("%s: No support for Spartan-II devices.\n", printf ("%s: No support for Spartan-II devices.\n",

32
include/spartan2.h
View file

@ -10,9 +10,9 @@
#include <xilinx.h> #include <xilinx.h>
extern int Spartan2_load(Xilinx_desc *desc, const void *image, size_t size); int spartan2_load(Xilinx_desc *desc, const void *image, size_t size);
extern int Spartan2_dump(Xilinx_desc *desc, const void *buf, size_t bsize); int spartan2_dump(Xilinx_desc *desc, const void *buf, size_t bsize);
extern int Spartan2_info(Xilinx_desc *desc); int spartan2_info(Xilinx_desc *desc);
/* Slave Parallel Implementation function table */ /* Slave Parallel Implementation function table */
typedef struct { typedef struct {
@ -29,7 +29,7 @@ typedef struct {
Xilinx_busy_fn busy; Xilinx_busy_fn busy;
Xilinx_abort_fn abort; Xilinx_abort_fn abort;
Xilinx_post_fn post; Xilinx_post_fn post;
} Xilinx_Spartan2_Slave_Parallel_fns; } xilinx_spartan2_slave_parallel_fns;
/* Slave Serial Implementation function table */ /* Slave Serial Implementation function table */
typedef struct { typedef struct {
@ -40,7 +40,7 @@ typedef struct {
Xilinx_done_fn done; Xilinx_done_fn done;
Xilinx_wr_fn wr; Xilinx_wr_fn wr;
Xilinx_post_fn post; Xilinx_post_fn post;
} Xilinx_Spartan2_Slave_Serial_fns; } xilinx_spartan2_slave_serial_fns;
/* Device Image Sizes /* Device Image Sizes
*********************************************************************/ *********************************************************************/
@ -63,36 +63,36 @@ typedef struct {
*********************************************************************/ *********************************************************************/
/* Spartan-II devices */ /* Spartan-II devices */
#define XILINX_XC2S15_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S15_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S15_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S15_SIZE, fn_table, cookie }
#define XILINX_XC2S30_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S30_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S30_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S30_SIZE, fn_table, cookie }
#define XILINX_XC2S50_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S50_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S50_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S50_SIZE, fn_table, cookie }
#define XILINX_XC2S100_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S100_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S100_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S100_SIZE, fn_table, cookie }
#define XILINX_XC2S150_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S150_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S150_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S150_SIZE, fn_table, cookie }
#define XILINX_XC2S200_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S200_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S200_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S200_SIZE, fn_table, cookie }
#define XILINX_XC2S50E_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S50E_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S50E_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S50E_SIZE, fn_table, cookie }
#define XILINX_XC2S100E_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S100E_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S100E_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S100E_SIZE, fn_table, cookie }
#define XILINX_XC2S150E_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S150E_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S150E_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S150E_SIZE, fn_table, cookie }
#define XILINX_XC2S200E_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S200E_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S200E_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S200E_SIZE, fn_table, cookie }
#define XILINX_XC2S300E_DESC(iface, fn_table, cookie) \ #define XILINX_XC2S300E_DESC(iface, fn_table, cookie) \
{ Xilinx_Spartan2, iface, XILINX_XC2S300E_SIZE, fn_table, cookie } { xilinx_spartan2, iface, XILINX_XC2S300E_SIZE, fn_table, cookie }
#endif /* _SPARTAN2_H_ */ #endif /* _SPARTAN2_H_ */

2
include/xilinx.h
View file

@ -26,7 +26,7 @@ typedef enum { /* typedef Xilinx_iface */
typedef enum { /* typedef Xilinx_Family */ typedef enum { /* typedef Xilinx_Family */
min_xilinx_type, /* low range check value */ min_xilinx_type, /* low range check value */
Xilinx_Spartan2, /* Spartan-II Family */ xilinx_spartan2, /* Spartan-II Family */
Xilinx_VirtexE, /* Virtex-E Family */ Xilinx_VirtexE, /* Virtex-E Family */
Xilinx_Virtex2, /* Virtex2 Family */ Xilinx_Virtex2, /* Virtex2 Family */
Xilinx_Spartan3, /* Spartan-III Family */ Xilinx_Spartan3, /* Spartan-III Family */