Merge remote-tracking branch 'u-boot/master' into test

[karo-tx-uboot.git] / board / spear / x600 / fpga.c

diff --git a/board/spear/x600/fpga.c b/board/spear/x600/fpga.c
index 85eb31be7bc085cbbad800e0ce6db96b68dc80c6..b256222e186487515537d9d60dd85a66c44f300b 100644 (file)
--- a/board/spear/x600/fpga.c
+++ b/board/spear/x600/fpga.c
@@ -1,23 +1,7 @@
 /*
  * Copyright (C) 2012 Stefan Roese <sr@denx.de>
  *
- * 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>
@@ -113,7 +97,7 @@ static int fpga_done_fn(int cookie)
 static int fpga_pre_config_fn(int cookie)
 {
        debug("%s:%d: FPGA pre-configuration\n", __func__, __LINE__);
-       fpga_reset(TRUE);
+       fpga_reset(true);
 
        return 0;
 }
@@ -128,9 +112,9 @@ static int fpga_post_config_fn(int cookie)
 
        debug("%s:%d: FPGA post configuration\n", __func__, __LINE__);
 
-       fpga_reset(TRUE);
+       fpga_reset(true);
        udelay(100);
-       fpga_reset(FALSE);
+       fpga_reset(false);
        udelay(100);
 
        return rc;
@@ -179,7 +163,7 @@ static int fpga_wr_fn(int assert_write, int flush, int cookie)
        return assert_write;
 }
 
-static Xilinx_Spartan3_Slave_Serial_fns x600_fpga_fns = {
+static xilinx_spartan3_slave_serial_fns x600_fpga_fns = {
        fpga_pre_config_fn,
        fpga_pgm_fn,
        fpga_clk_fn,
@@ -189,7 +173,7 @@ static Xilinx_Spartan3_Slave_Serial_fns x600_fpga_fns = {
        fpga_post_config_fn,
 };
 
-static Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
+static xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
        XILINX_XC3S1200E_DESC(slave_serial, &x600_fpga_fns, 0)
 };
 
@@ -200,7 +184,7 @@ static Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
 static void fpga_serialslave_init(void)
 {
        debug("%s:%d: Initialize serial slave interface\n", __func__, __LINE__);
-       fpga_pgm_fn(FALSE, FALSE, 0);   /* make sure program pin is inactive */
+       fpga_pgm_fn(false, false, 0);   /* make sure program pin is inactive */
 }
 
 static int expi_setup(int freq)