Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / board / esd / cpciiser4 / cpciiser4.c

diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c
index b5d25433f591fcd54270e5c89024c59d04fd4032..e61cd5b1b3f280f242a9aa09a0674bffe84dc09f 100644 (file)
--- a/board/esd/cpciiser4/cpciiser4.c
+++ b/board/esd/cpciiser4/cpciiser4.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -28,9 +12,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/*cmd_boot.c*/
-
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 extern void lxt971_no_sleep(void);
 
 
@@ -58,7 +39,6 @@ const unsigned char fpgadata[] = {
 int board_early_init_f (void)
 {
        int index, len, i;
-       volatile unsigned char dummy;
        int status;
 
 #ifdef FPGA_DEBUG
@@ -116,7 +96,7 @@ int board_early_init_f (void)
        /*
         * Init FPGA via RESET (read access on CS3)
         */
-       dummy = *(unsigned char *) 0xf0200000;
+       in_8((void *)0xf0200000);
 
        /*
         * IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -130,14 +110,14 @@ int board_early_init_f (void)
         * IRQ 30 (EXT IRQ 5) PCI SLOT 3; active low; level sensitive
         * IRQ 31 (EXT IRQ 6) COMPACT FLASH; active high; level sensitive
         */
-       mtdcr (uicsr, 0xFFFFFFFF);      /* clear all ints */
-       mtdcr (uicer, 0x00000000);      /* disable all ints */
-       mtdcr (uiccr, 0x00000000);      /* set all to be non-critical */
-       /*  mtdcr(uicpr, 0xFFFFFF81);   /  set int polarities */
-       mtdcr (uicpr, 0xFFFFFF80);      /* set int polarities */
-       mtdcr (uictr, 0x10000000);      /* set int trigger levels */
-       mtdcr (uicvcr, 0x00000001);     /* set vect base=0,INT0 highest priority */
-       mtdcr (uicsr, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr (UIC0SR, 0xFFFFFFFF);     /* clear all ints */
+       mtdcr (UIC0ER, 0x00000000);     /* disable all ints */
+       mtdcr (UIC0CR, 0x00000000);     /* set all to be non-critical */
+       /*  mtdcr(UIC0PR, 0xFFFFFF81);   /  set int polarities */
+       mtdcr (UIC0PR, 0xFFFFFF80);     /* set int polarities */
+       mtdcr (UIC0TR, 0x10000000);     /* set int trigger levels */
+       mtdcr (UIC0VCR, 0x00000001);    /* set vect base=0,INT0 highest priority */
+       mtdcr (UIC0SR, 0xFFFFFFFF);     /* clear all ints */
 
        return 0;
 }
@@ -154,7 +134,7 @@ int checkboard (void)
        int index;
        int len;
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       int i = getenv_f("serial#", str, sizeof (str));
 
        puts ("Board: ");