mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-22 04:44:46 +00:00
fpga: Remove CONFIG_FPGA_COUNT
This define is only currently used in a single board, and always set to one. Define this within the board code and remove other references. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
82e0b51ccb
commit
60d45642fe
5 changed files with 5 additions and 18 deletions
4
README
4
README
|
@ -1350,10 +1350,6 @@ The following options need to be configured:
|
||||||
Enables support for FPGA family.
|
Enables support for FPGA family.
|
||||||
(SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX)
|
(SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX)
|
||||||
|
|
||||||
CONFIG_FPGA_COUNT
|
|
||||||
|
|
||||||
Specify the number of FPGA devices to support.
|
|
||||||
|
|
||||||
CONFIG_SYS_FPGA_PROG_FEEDBACK
|
CONFIG_SYS_FPGA_PROG_FEEDBACK
|
||||||
|
|
||||||
Enable printing of hash marks during FPGA configuration.
|
Enable printing of hash marks during FPGA configuration.
|
||||||
|
|
|
@ -168,7 +168,8 @@ Altera_CYC2_Passive_Serial_fns altera_fns = {
|
||||||
altera_post_fn
|
altera_post_fn
|
||||||
};
|
};
|
||||||
|
|
||||||
Altera_desc altera_fpga[CONFIG_FPGA_COUNT] = {
|
#define FPGA_COUNT 1
|
||||||
|
Altera_desc altera_fpga[FPGA_COUNT] = {
|
||||||
{Altera_CYC2,
|
{Altera_CYC2,
|
||||||
passive_serial,
|
passive_serial,
|
||||||
85903,
|
85903,
|
||||||
|
@ -182,7 +183,7 @@ int astro5373l_altera_load(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
|
for (i = 0; i < FPGA_COUNT; i++) {
|
||||||
/*
|
/*
|
||||||
* I did not yet manage to get relocation work properly,
|
* I did not yet manage to get relocation work properly,
|
||||||
* so set stuff here instead of static initialisation:
|
* so set stuff here instead of static initialisation:
|
||||||
|
@ -372,7 +373,7 @@ xilinx_spartan3_slave_serial_fns xilinx_fns = {
|
||||||
xilinx_fastwr_config_fn
|
xilinx_fastwr_config_fn
|
||||||
};
|
};
|
||||||
|
|
||||||
xilinx_desc xilinx_fpga[CONFIG_FPGA_COUNT] = {
|
xilinx_desc xilinx_fpga[FPGA_COUNT] = {
|
||||||
{xilinx_spartan3,
|
{xilinx_spartan3,
|
||||||
slave_serial,
|
slave_serial,
|
||||||
XILINX_XC3S4000_SIZE,
|
XILINX_XC3S4000_SIZE,
|
||||||
|
@ -388,7 +389,7 @@ int astro5373l_xilinx_load(void)
|
||||||
|
|
||||||
fpga_init();
|
fpga_init();
|
||||||
|
|
||||||
for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
|
for (i = 0; i < FPGA_COUNT; i++) {
|
||||||
/*
|
/*
|
||||||
* I did not yet manage to get relocation work properly,
|
* I did not yet manage to get relocation work properly,
|
||||||
* so set stuff here instead of static initialisation:
|
* so set stuff here instead of static initialisation:
|
||||||
|
|
|
@ -133,7 +133,6 @@
|
||||||
* it needs non-blocking CFI routines.
|
* it needs non-blocking CFI routines.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFIG_FPGA_COUNT 1
|
|
||||||
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
|
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
|
||||||
#define CONFIG_SYS_FPGA_WAIT 1000
|
#define CONFIG_SYS_FPGA_WAIT 1000
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
#define CONFIG_MXC_UART_BASE UART2_BASE
|
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||||||
|
|
||||||
#define CONFIG_FPGA_COUNT 1
|
|
||||||
|
|
||||||
/* MMC Configs */
|
/* MMC Configs */
|
||||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||||
#define CONFIG_SYS_FSL_ESDHC_NUM 2
|
#define CONFIG_SYS_FSL_ESDHC_NUM 2
|
||||||
|
|
|
@ -58,13 +58,6 @@
|
||||||
#define CONFIG_DW_ALTDESCRIPTOR
|
#define CONFIG_DW_ALTDESCRIPTOR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* FPGA Driver
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_CMD_FPGA
|
|
||||||
#define CONFIG_FPGA_COUNT 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* L4 OSC1 Timer 0
|
* L4 OSC1 Timer 0
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue