[U-Boot-Users] Altera Stratix II support

eran liberty
2007-06-04T20:13:01Z

Altera Stratix II support (generic implemetation)
===================start of patch =============================
diff -x .svn -Nuar u-boot.git/common/altera.c u-boot-exsw6000/common/altera.c
--- u-boot.git/common/altera.c 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/common/altera.c 2007-06-03 22:15:48.000000000 +0300
@@ -1,4 +1,7 @@
/*
+ * (C) Copyright 2007
+ * Eran Liberty, Extricom , eran.liberty at gmail.com
+ *
* (C) Copyright 2003
* Steven Scholz, imc Measurement & Control, steven.scholz at imc-berlin.de
*
@@ -30,6 +33,7 @@
*/
#include <common.h>
#include <ACEX1K.h>
+#include <stratixII.h>

/* Define FPGA_DEBUG to get debug printf's */
/* #define FPGA_DEBUG */
@@ -43,7 +47,7 @@
#if (CONFIG_FPGA & CFG_FPGA_ALTERA)

/* Local Static Functions */
-static int altera_validate (Altera_desc * desc, char *fn);
+static int altera_validate (Altera_desc * desc,const char *fn);

/* ------------------------------------------------------------------------- */
int altera_load( Altera_desc *desc, void *buf, size_t bsize )
@@ -69,6 +73,16 @@
__FUNCTION__);
#endif
break;
+ case Altera_StratixII:
+#if (CONFIG_FPGA & CFG_STRATIX_II)
+ PRINTF ("%s: Launching the Stratix II Loader...\n",
+ __FUNCTION__);
+ ret_val = StratixII_load (desc, buf, bsize);
+#else
+ printf ("%s: No support for Stratix II devices.\n",
+ __FUNCTION__);
+#endif
+ break;

default:
printf ("%s: Unsupported family type, %d\n",
@@ -97,6 +111,16 @@
__FUNCTION__);
#endif
break;
+ case Altera_StratixII:
+#if (CONFIG_FPGA & CFG_STRATIX_II)
+ PRINTF ("%s: Launching the Stratix II Reader...\n",
+ __FUNCTION__);
+ ret_val = StratixII_dump (desc, buf, bsize);
+#else
+ printf ("%s: No support for Stratix II devices.\n",
+ __FUNCTION__);
+#endif
+ break;

default:
printf ("%s: Unsupported family type, %d\n",
@@ -117,6 +141,9 @@
case Altera_ACEX1K:
printf ("ACEX1K\n");
break;
+ case Altera_StratixII:
+ printf ("Stratix II\n");
+ break;
/* Add new family types here */
case Altera_CYC2:
printf ("CYCLON II\n");
@@ -142,6 +169,9 @@
case altera_jtag_mode: /* Not used */
printf ("JTAG Mode\n");
break;
+ case fast_passive_parallel:
+ printf ("Fast Passive Parallel (FPP)\n");
+ break;
/* Add new interface types here */
default:
printf ("Unsupported interface type, %d\n", desc->iface);
@@ -166,6 +196,14 @@
__FUNCTION__);
#endif
break;
+ case Altera_StratixII:
+#if (CONFIG_FPGA & CFG_STRATIX_II)
+ StratixII_info (desc);
+#else
+ printf ("%s: No support for Stratix II devices.\n",
+ __FUNCTION__);
+#endif
+ break;
/* Add new family types here */
default:
/* we don't need a message here - we give one up above */
@@ -199,6 +237,16 @@
__FUNCTION__);
#endif
break;
+
+ case Altera_StratixII:
+#if (CONFIG_FPGA & CFG_STRATIX_II)
+ ret_val = StratixII_reloc (desc, reloc_offset);
+#else
+ printf ("%s: No support for Stratix II devices.\n",
+ __FUNCTION__);
+#endif
+ break;
+
case Altera_CYC2:
#if (CONFIG_FPGA & CFG_CYCLON2)
ret_val = CYC2_reloc (desc, reloc_offset);
@@ -219,7 +267,7 @@

/* ------------------------------------------------------------------------- */

-static int altera_validate (Altera_desc * desc, char *fn)
+static int altera_validate (Altera_desc * desc, const char *fn)
{
int ret_val = FALSE;

diff -x .svn -Nuar u-boot.git/common/Makefile u-boot-exsw6000/common/Makefile
--- u-boot.git/common/Makefile 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/common/Makefile 2007-06-03 22:23:57.000000000 +0300
@@ -27,8 +27,9 @@

AOBJS =

-COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
+COBJS = main.o ACEX1K.o altera.o stratixII.o \
+ bedbug.o circbuf.o cmd_autoscript.o \
cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
cmd_cache.o cmd_console.o \
cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
diff -x .svn -Nuar u-boot.git/common/stratixII.c
u-boot-exsw6000/common/stratixII.c
--- u-boot.git/common/stratixII.c 1970-01-01 02:00:00.000000000 +0200
+++ u-boot-exsw6000/common/stratixII.c 2007-06-03 21:55:51.000000000 +0300
@@ -0,0 +1,186 @@
+/*
+ * (C) Copyright 2007
+ * Eran Liberty, Extricom , eran.liberty at gmail.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+
+#include <common.h> /* core U-Boot definitions */
+#include <altera.h>
+
+#if (CONFIG_FPGA & (CFG_ALTERA | CFG_STRATIX_II))
+
+int StratixII_fpp_load(Altera_desc * desc, void *buf, size_t bsize);
+int StratixII_fpp_dump(Altera_desc * desc, void *buf, size_t bsize);
+
+/****************************************************************/
+/* Stratix II Generic Implementation */
+int StratixII_load (Altera_desc * desc, void *buf, size_t bsize)
+{
+ int ret_val = FPGA_FAIL;
+
+ switch (desc->iface) {
+ case fast_passive_parallel:
+ ret_val = StratixII_fpp_load(desc, buf, bsize);
+ break;
+
+ /* Add new interface types here */
+ default:
+ printf ("%s: Unsupported interface type, %d\n", __FUNCTION__, desc->iface);
+ }
+ return ret_val;
+}
+
+int StratixII_dump (Altera_desc * desc, void *buf, size_t bsize)
+{
+ int ret_val = FPGA_FAIL;
+
+ switch (desc->iface) {
+ case fast_passive_parallel:
+ ret_val = StratixII_fpp_dump(desc, buf, bsize);
+ break;
+ /* Add new interface types here */
+ default:
+ printf ("%s: Unsupported interface type, %d\n", __FUNCTION__, desc->iface);
+ }
+ return ret_val;
+}
+
+int StratixII_info( Altera_desc *desc )
+{
+ return FPGA_SUCCESS;
+}
+
+int StratixII_reloc (Altera_desc * desc, ulong reloc_offset)
+{
+ int i;
+ void** func_table;
+
+ desc->iface_fns = (void*)((ulong)(desc->iface_fns) + reloc_offset);
+ for (i=0,func_table = (void**)desc->iface_fns;i<
sizeof(altera_board_specific_func)/sizeof(void*);i++) {
+ func_table[i] = (void*)((ulong)(func_table[i]) + reloc_offset);
+ }
+ return FPGA_SUCCESS;
+}
+
+#endif
+
+/************************************************************/
+/* Stratix II Fast Passive Parallel Generic Implementation */
+int StratixII_fpp_dump(Altera_desc * desc, void *buf, size_t bsize)
+{
+ printf("Stratix II Fast Passive Parallel dump is not implemented\n");
+ return FPGA_FAIL;
+}
+
+int StratixII_fpp_load(Altera_desc * desc, void *buf, size_t bsize)
+{
+ altera_board_specific_func *fns;
+ int cookie;
+ int ret_val = FPGA_FAIL;
+ int bytecount;
+ char *buff = buf;
+
+ if (!desc) {
+ printf("%s(%d) Altera_desc missing\n",__FUNCTION__,__LINE__);
+ return FPGA_FAIL;
+ }
+ if (!buff) {
+ printf("%s(%d) buffer is missing\n",__FUNCTION__,__LINE__);
+ return FPGA_FAIL;
+ }
+ if (!bsize) {
+ printf("%s(%d) size is zero\n",__FUNCTION__,__LINE__);
+ return FPGA_FAIL;
+ }
+ if (!desc->iface_fns) {
+ printf("%s(%d) Altera_desc function interface table is
missing\n",__FUNCTION__,__LINE__);
+ return FPGA_FAIL;
+ }
+ fns = (altera_board_specific_func *)(desc->iface_fns);
+ cookie = desc->cookie;
+
+ if (!(fns->config && fns->status && fns->done && fns->data && fns->abort)) {
+ printf("%s(%d) Missing some function in the function interface
table\n",__FUNCTION__,__LINE__);
+ return FPGA_FAIL;
+ }
+
+ /* 1. give board specific a chance to do anything before we start */
+ if (fns->pre) {
+ if ((ret_val = fns->pre(cookie)) < 0 ) {
+ return ret_val;
+ }
+ }
+
+ /* from this point on we must fail gracfully by calling lower layer abort */
+
+ /* 2. Strat burn cycle by deasserting config for t_CFG and waiting
t_CF2CK after reaserted*/
+ fns->config(0,1,cookie);
+ udelay(2); /* nCONFIG low pulse width 2usec*/
+ fns->config(1,1,cookie);
+ udelay(100); /* nCONFIG high to first rising edge on DCLK */
+
+ /* 3. Start the Data cycle with clk deasserted*/
+ bytecount = 0;
+ fns->clk(0,1,cookie);
+
+ printf("loading to fpga ");
+ while(bytecount < bsize) {
+ /* 3.1 check stratix has not signaled us an error */
+ if (fns->status(cookie) != 1) {
+ printf("\n%s(%d) Stratix failed (byte transfered till failure
0x%x)\n",__FUNCTION__,__LINE__,bytecount);
+ fns->abort(cookie);
+ return FPGA_FAIL;
+ }
+ /* 3.2 put data on the bus */
+ fns->data(buff[bytecount++],1,cookie);
+ ndelay(5);
+ fns->clk(1,1,cookie);
+ ndelay(5);
+ fns->clk(0,1,cookie);
+
+ /* 3.3 while clk is deasserted it is safe to print some progress indication*/
+ if ((bytecount % (bsize / 100)) == 0) {
+ printf("\b\b\b%02d\%",bytecount*100/bsize);
+ }
+ }
+
+ /* 4. Set one last clock and check conf done signal */
+ fns->clk(1,1,cookie);
+ udelay(100);
+ if (!fns->done(cookie)) {
+ printf(" error!.\n");
+ fns->abort(cookie);
+ return FPGA_FAIL;
+ }
+ else {
+ printf("\b\b\b done.\n");
+ }
+
+ /* 5. call lower layer post configuration */
+ if (fns->post) {
+ if ((ret_val = fns->pre(cookie)) < 0 ) {
+ fns->abort(cookie);
+ return ret_val;
+ }
+ }
+
+ return FPGA_SUCCESS;
+}
diff -x .svn -Nuar u-boot.git/include/altera.h u-boot-exsw6000/include/altera.h
--- u-boot.git/include/altera.h 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/include/altera.h 2007-06-03 22:13:42.000000000 +0300
@@ -27,22 +27,21 @@
#ifndef _ALTERA_H_
#define _ALTERA_H_

-/*
- * See include/xilinx.h for another working example.
- */
-
/* Altera Model definitions
*********************************************************************/
#define CFG_ACEX1K CFG_FPGA_DEV( 0x1 )
#define CFG_CYCLON2 CFG_FPGA_DEV( 0x2 )
+#define CFG_STRATIX_II CFG_FPGA_DEV( 0x4 )

#define CFG_ALTERA_ACEX1K (CFG_FPGA_ALTERA | CFG_ACEX1K)
#define CFG_ALTERA_CYCLON2 (CFG_FPGA_ALTERA | CFG_CYCLON2)
+#define CFG_ALTERA_STRATIX_II (CFG_FPGA_ALTERA | CFG_STRATIX_II)
/* Add new models here */

/* Altera Interface definitions
*********************************************************************/
#define CFG_ALTERA_IF_PS CFG_FPGA_IF( 0x1 ) /* passive serial */
+#define CFG_ALTERA_IF_FPP CFG_FPGA_IF( 0x2 ) /* fast passive parallel */
/* Add new interfaces here */

typedef enum { /* typedef Altera_iface */
@@ -52,15 +51,17 @@
passive_parallel_asynchronous, /* parallel data */
passive_serial_asynchronous, /* serial data w/ internal clock (not used) */
altera_jtag_mode, /* jtag/tap serial (not used ) */
+ fast_passive_parallel, /* fast passive parallel (FPP) */
max_altera_iface_type /* insert all new types before this */
} Altera_iface; /* end, typedef Altera_iface */

typedef enum { /* typedef Altera_Family */
- min_altera_type, /* insert all new types after this */
- Altera_ACEX1K, /* ACEX1K Family */
- Altera_CYC2, /* CYCLONII Family */
-/* Add new models here */
- max_altera_type /* insert all new types before this */
+ min_altera_type, /* insert all new types after this */
+ Altera_ACEX1K, /* ACEX1K Family */
+ Altera_CYC2, /* CYCLONII Family */
+ Altera_StratixII, /* StratixII Familiy */
+ /* Add new models here */
+ max_altera_type /* insert all new types before this */
} Altera_Family; /* end, typedef Altera_Family */

typedef struct { /* typedef Altera_desc */
@@ -91,4 +92,15 @@
typedef int (*Altera_abort_fn)( int cookie );
typedef int (*Altera_post_fn)( int cookie );

+typedef struct {
+ Altera_pre_fn pre;
+ Altera_config_fn config;
+ Altera_status_fn status;
+ Altera_done_fn done;
+ Altera_clk_fn clk;
+ Altera_data_fn data;
+ Altera_abort_fn abort;
+ Altera_post_fn post;
+} altera_board_specific_func;
+
#endif /* _ALTERA_H_ */
diff -x .svn -Nuar u-boot.git/include/common.h u-boot-exsw6000/include/common.h
--- u-boot.git/include/common.h 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/include/common.h 2007-06-03 19:41:02.000000000 +0300
@@ -559,6 +559,7 @@

/* lib_$(ARCH)/time.c */
void udelay (unsigned long);
+void ndelay (unsigned long);
ulong usec2ticks (unsigned long usec);
ulong ticks2usec (unsigned long ticks);
int init_timebase (void);
diff -x .svn -Nuar u-boot.git/include/exports.h
u-boot-exsw6000/include/exports.h
--- u-boot.git/include/exports.h 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/include/exports.h 2007-05-27 13:16:57.000000000 +0300
@@ -17,6 +17,7 @@
void *malloc(size_t);
void free(void*);
void udelay(unsigned long);
+void ndelay(unsigned long);
unsigned long get_timer(unsigned long);
void vprintf(const char *, va_list);
void do_reset (void);
diff -x .svn -Nuar u-boot.git/include/stratixII.h
u-boot-exsw6000/include/stratixII.h
--- u-boot.git/include/stratixII.h 1970-01-01 02:00:00.000000000 +0200
+++ u-boot-exsw6000/include/stratixII.h 2007-05-22 11:45:21.000000000 +0300
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2007
+ * Eran Liberty, Extricom, eran.liberty at gmail.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+#ifndef _STRATIXII_H_
+#define _STRATIXII_H_
+
+extern int StratixII_load( Altera_desc *desc, void *image, size_t size );
+extern int StratixII_dump( Altera_desc *desc, void *buf, size_t bsize );
+extern int StratixII_info( Altera_desc *desc );
+extern int StratixII_reloc( Altera_desc *desc, ulong reloc_off );
+
+#endif /* _STRATIXII_H_ */
+
diff -x .svn -Nuar u-boot.git/lib_ppc/time.c u-boot-exsw6000/lib_ppc/time.c
--- u-boot.git/lib_ppc/time.c 2007-05-28 02:11:11.000000000 +0300
+++ u-boot-exsw6000/lib_ppc/time.c 2007-06-03 22:03:21.000000000 +0300
@@ -60,6 +60,15 @@

/* ------------------------------------------------------------------------- */

+void ndelay(unsigned long nsec)
+{
+ ulong ticks = usec2ticks(1)*nsec/1000 +1;
+
+ wait_ticks (ticks);
+}
+
+/* ------------------------------------------------------------------------- */
+
unsigned long ticks2usec(unsigned long ticks)
{
ulong tbclk = get_tbclk();

=====================end of patch =======================