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

[karo-tx-uboot.git] / board / ti / evm / evm.h

diff --git a/board/ti/evm/evm.h b/board/ti/evm/evm.h
index a76deb838c05796869d1a64f6714d283363d5980..f50193d99af5d5f7e6d184abc175309688223504 100644 (file)
--- a/board/ti/evm/evm.h
+++ b/board/ti/evm/evm.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2008
  * Nishanth Menon <menon.nishanth@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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef _EVM_H_
 #define _EVM_H_
@@ -45,10 +29,11 @@ enum {
        OMAP3EVM_BOARD_GEN_2,           /* EVM Rev >= Rev E */
 };
 
-u8 get_omap3_evm_rev(void);
+u32 get_omap3_evm_rev(void);
 
 #if defined(CONFIG_CMD_NET)
 static void setup_net_chip(void);
+static void reset_net_chip(void);
 #endif
 
 /*