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

diff --cc arch/arm/cpu/armv7/highbank/timer.c
Simple merge

diff --cc arch/arm/include/asm/arch-armv7/systimer.h
Simple merge

diff --cc arch/arm/lib/board.c
Simple merge

diff --cc board/altera/socfpga/Makefile
index 43bbc3785f4c63ae4204c87707eee5b4ebf5f29e,0000000000000000000000000000000000000000..101fc7c71c18207bfd2430290aeb51aaf4576912
mode 100644,000000..100644
--- 1/board/altera/socfpga/Makefile
--- /dev/null
+++ b/board/altera/socfpga/Makefile
@@@ -1,50 -1,0 +1,34 @@@
- # 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
 +#
 +# (C) Copyright 2001-2006
 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 +# (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw>
 +#
++# SPDX-License-Identifier:    GPL-2.0+
 +#
 +
 +include $(TOPDIR)/config.mk
 +
 +LIB   = $(obj)lib$(BOARD).o
 +
 +COBJS := socfpga_cyclone5.o
 +
 +SRCS  := $(COBJS:.o=.c)
 +OBJS  := $(addprefix $(obj),$(COBJS))
 +
 +$(LIB):       $(obj).depend $(OBJS)
 +      $(call cmd_link_o_target, $(OBJS))
 +
 +clean:
 +      rm -f $(OBJS)
 +
 +distclean:    clean
 +      rm -f $(LIB) core *.bak $(obj).depend
 +
 +#########################################################################
 +
 +# defines $(obj).depend target
 +include $(SRCTREE)/rules.mk
 +
 +sinclude $(obj).depend
 +
 +#########################################################################

diff --cc board/altera/socfpga/socfpga_cyclone5.c
index 7725be12f4e60f9efbf98a2b061818a11fdfe764,0000000000000000000000000000000000000000..576066bef13f3bd06a8b5d93e9206189a0b95462
mode 100644,000000..100644
--- 1/board/altera/socfpga/socfpga_cyclone5.c
--- /dev/null
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@@ -1,80 -1,0 +1,69 @@@
-  * 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, see <http://www.gnu.org/licenses/>.
 +/*
 + *  Copyright (C) 2012 Altera Corporation <www.altera.com>
 + *
++ * SPDX-License-Identifier:   GPL-2.0+
 + */
 +
 +#include <common.h>
 +#include <asm/arch/reset_manager.h>
 +#include <asm/io.h>
 +
 +#include <netdev.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
 +/*
 + * Print CPU information
 + */
 +int print_cpuinfo(void)
 +{
 +      puts("CPU   : Altera SOCFPGA Platform\n");
 +      return 0;
 +}
 +
 +/*
 + * Print Board information
 + */
 +int checkboard(void)
 +{
 +      puts("BOARD : Altera SOCFPGA Cyclone5 Board\n");
 +      return 0;
 +}
 +
 +/*
 + * Initialization function which happen at early stage of c code
 + */
 +int board_early_init_f(void)
 +{
 +      return 0;
 +}
 +
 +/*
 + * Miscellaneous platform dependent initialisations
 + */
 +int board_init(void)
 +{
 +      icache_enable();
 +      return 0;
 +}
 +
 +int misc_init_r(void)
 +{
 +      return 0;
 +}
 +
 +#if defined(CONFIG_SYS_CONSOLE_IS_IN_ENV) && defined(CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE)
 +int overwrite_console(void)
 +{
 +      return 0;
 +}
 +#endif
 +
 +/*
 + * DesignWare Ethernet initialization
 + */
 +/* We know all the init functions have been run now */
 +int board_eth_init(bd_t *bis)
 +{
 +      return 0;
 +}

diff --cc board/highbank/highbank.c
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc drivers/net/calxedaxgmac.c
Simple merge

diff --cc include/configs/highbank.h
Simple merge