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

[karo-tx-uboot.git] / arch / nds32 / include / asm / u-boot.h

diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h
index eabbf38fb1a55fc5dd95b92ad78e652477306b95..44e72d414b9de9ad94504305700de7bca1cd47ee 100644 (file)
--- a/arch/nds32/include/asm/u-boot.h
+++ b/arch/nds32/include/asm/u-boot.h
@@ -7,23 +7,7 @@
  * Copyright (C) 2010 Shawn Lin (nobuhiro@andestech.com)
  * Copyright (C) 2011 Macpaul Lin (macpaul@andestech.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+
  *
  ********************************************************************
  * NOTE: This header file defines an interface to U-Boot. Including
@@ -39,8 +23,6 @@
 #include <environment.h>
 
 typedef struct bd_info {
-       int             bi_baudrate;    /* serial console baudrate */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_arch_number; /* unique id for this board */
        unsigned long   bi_boot_params; /* where this board expects params */
        unsigned long   bi_memstart;    /* start of DRAM memory */