Merge branch 'master' of git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / drivers / fpga / stratixII.c

diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c
index 7556dbfb3d776144ab6393644a43526d801119e1..12d8dd19bf6da3599e2c8b2ed6b4761670fd3bab 100644 (file)
--- a/drivers/fpga/stratixII.c
+++ b/drivers/fpga/stratixII.c
@@ -1,25 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007
  * Eran Liberty, Extricom , eran.liberty@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 */
@@ -77,30 +59,6 @@ int StratixII_info (Altera_desc * desc)
        return FPGA_SUCCESS;
 }
 
-int StratixII_reloc (Altera_desc * desc, ulong reloc_offset)
-{
-       int i;
-       uint32_t dest = (uint32_t) desc & 0xff000000;
-
-       /* we assume a relocated code and non relocated code has different upper 8 bits */
-       if (dest != ((uint32_t) desc->iface_fns & 0xff000000)) {
-               desc->iface_fns =
-                   (void *)((uint32_t) (desc->iface_fns) + reloc_offset);
-       }
-       for (i = 0; i < sizeof (altera_board_specific_func) / sizeof (void *);
-            i++) {
-               if (dest !=
-                   ((uint32_t) (((void **)(desc->iface_fns))[i]) & 0xff000000))
-               {
-                       ((void **)(desc->iface_fns))[i] =
-                           (void
-                            *)(((uint32_t) (((void **)(desc->iface_fns))[i])) +
-                               reloc_offset);
-               }
-       }
-       return FPGA_SUCCESS;
-}
-
 int StratixII_ps_fpp_dump (Altera_desc * desc, void *buf, size_t bsize)
 {
        printf ("Stratix II Fast Passive Parallel dump is not implemented\n");
@@ -171,7 +129,7 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t 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",
+                           ("\n%s(%d) Stratix failed (byte transferred till failure 0x%x)\n",
                             __FUNCTION__, __LINE__, bytecount);
                        fns->abort (cookie);
                        return FPGA_FAIL;