Merge git://git.denx.de/u-boot-arm

Conflicts:
	board/freescale/mx6qsabrelite/Makefile
	board/freescale/mx6qsabrelite/mx6qsabrelite.c
	include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <sbabic@denx.de>

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv7/mx6/clock.c
Simple merge

diff --cc arch/arm/cpu/armv7/mx6/soc.c
Simple merge

diff --cc arch/arm/imx-common/cmd_hdmidet.c
Simple merge

diff --cc arch/arm/include/asm/arch-mx6/clock.h
Simple merge

diff --cc arch/arm/include/asm/arch-mx6/mxc_hdmi.h
Simple merge

diff --cc board/boundary/nitrogen6x/nitrogen6x.c
Simple merge

diff --cc board/freescale/mx6sabresd/mx6sabresd.c
Simple merge

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

diff --cc boards.cfg
Simple merge

diff --cc drivers/gpio/mxc_gpio.c
Simple merge

diff --cc drivers/video/mxc_ipuv3_fb.c
Simple merge

diff --cc include/configs/apx4devkit.h
index 7081f37,8561a24..d1f18bc
--- 1/include/configs/apx4devkit.h
--- 2/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@@ -9,21 -9,16 +9,13 @@@
   * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
   * on behalf of DENX Software Engineering GmbH
   *
-  * 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.
+  * SPDX-License-Identifier:   GPL-2.0+
   */
 -#ifndef __CONFIG_H
 -#define __CONFIG_H
 +#ifndef __CONFIGS_APX4DEVKIT_H__
 +#define __CONFIGS_APX4DEVKIT_H__
  
 -/* SoC configurations */
 +/* System configurations */
  #define CONFIG_MX28                           /* i.MX28 SoC */
 -#define CONFIG_MXS_GPIO                               /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
 -
  #define MACH_TYPE_APX4DEVKIT  3712
  #define CONFIG_MACH_TYPE      MACH_TYPE_APX4DEVKIT
  

diff --cc include/configs/m28evk.h
index b6fa6eb,fd3ae02..eba8759
--- 1/include/configs/m28evk.h
--- 2/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@@ -2,32 -2,45 +2,19 @@@
   * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
   * on behalf of DENX Software Engineering GmbH
   *
-  * 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 __M28EVK_CONFIG_H__
 -#define __M28EVK_CONFIG_H__
 +#ifndef __CONFIGS_M28EVK_H__
 +#define __CONFIGS_M28EVK_H__
  
 -/*
 - * SoC configurations
 - */
 -#define CONFIG_MX28                           /* i.MX28 SoC */
 -#define CONFIG_MXS_GPIO                               /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
  
 -/*
 - * Define M28EVK machine type by hand until it lands in mach-types
 - */
 +/* System configurations */
 +#define CONFIG_MX28                           /* i.MX28 SoC */
  #define MACH_TYPE_M28EVK      3613
 -
  #define CONFIG_MACH_TYPE      MACH_TYPE_M28EVK
  
 -#include <asm/arch/regs-base.h>
 -
 +/* U-Boot Commands */
  #define CONFIG_SYS_NO_FLASH
 -#define CONFIG_BOARD_EARLY_INIT_F
 -#define CONFIG_ARCH_MISC_INIT
 -
 -/*
 - * SPL
 - */
 -#define CONFIG_SPL
 -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 -#define CONFIG_SPL_START_S_PATH               "arch/arm/cpu/arm926ejs/mxs"
 -#define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 -#define CONFIG_SPL_LIBCOMMON_SUPPORT
 -#define CONFIG_SPL_LIBGENERIC_SUPPORT
 -#define CONFIG_SPL_GPIO_SUPPORT
 -
 -/*
 - * U-Boot Commands
 - */
  #include <config_cmd_default.h>
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DOS_PARTITION

diff --cc include/configs/mx23_olinuxino.h
index 418d4fd,94bedd6..575fe2a
--- 1/include/configs/mx23_olinuxino.h
--- 2/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@@ -1,30 -1,42 +1,17 @@@
  /*
   * Copyright (C) 2013 Marek Vasut <marex@denx.de>
   *
-  * 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 __MX23_OLINUXINO_CONFIG_H__
 -#define __MX23_OLINUXINO_CONFIG_H__
 +#ifndef __CONFIGS_MX23_OLINUXINO_H__
 +#define __CONFIGS_MX23_OLINUXINO_H__
  
 -#include <asm/arch/iomux-mx23.h>
 -
 -/*
 - * SoC configurations
 - */
 +/* System configurations */
  #define CONFIG_MX23                           /* i.MX23 SoC */
 -#define CONFIG_MXS_GPIO                               /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
 -
  #define CONFIG_MACH_TYPE      4105
  
 -#include <asm/arch/regs-base.h>
 -
 +/* U-Boot Commands */
  #define CONFIG_SYS_NO_FLASH
 -#define CONFIG_BOARD_EARLY_INIT_F
 -#define CONFIG_ARCH_MISC_INIT
 -
 -/*
 - * SPL
 - */
 -#define CONFIG_SPL
 -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 -#define CONFIG_SPL_START_S_PATH               "arch/arm/cpu/arm926ejs/mxs"
 -#define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 -#define CONFIG_SPL_LIBCOMMON_SUPPORT
 -#define CONFIG_SPL_LIBGENERIC_SUPPORT
 -#define CONFIG_SPL_GPIO_SUPPORT
 -
 -/*
 - * U-Boot Commands
 - */
  #include <config_cmd_default.h>
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DOS_PARTITION

diff --cc include/configs/mx23evk.h
index b52b9e6,2380649..1b40a36
--- 1/include/configs/mx23evk.h
--- 2/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@@ -4,30 -4,35 +4,17 @@@
   * Copyright (C) 2013 Otavio Salvador <otavio@ossystems.com.br>
   * on behalf of O.S. Systems Software LTDA.
   *
-  * 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 __MX23EVK_CONFIG_H__
 -#define __MX23EVK_CONFIG_H__
 +#ifndef __CONFIGS_MX23EVK_H__
 +#define __CONFIGS_MX23EVK_H__
  
 -/* SoC configurations */
 +/* System configurations */
  #define CONFIG_MX23                           /* i.MX23 SoC */
 -
 -#include <asm/arch/regs-base.h>
 -
 -#define CONFIG_MXS_GPIO                       /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
 -
  #define CONFIG_MACH_TYPE      MACH_TYPE_MX23EVK
  
 -#define CONFIG_SYS_NO_FLASH
 -#define CONFIG_BOARD_EARLY_INIT_F
 -#define CONFIG_ARCH_MISC_INIT
 -
 -/* SPL */
 -#define CONFIG_SPL
 -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 -#define CONFIG_SPL_START_S_PATH       "arch/arm/cpu/arm926ejs/mxs"
 -#define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 -#define CONFIG_SPL_LIBCOMMON_SUPPORT
 -#define CONFIG_SPL_LIBGENERIC_SUPPORT
 -#define CONFIG_SPL_GPIO_SUPPORT
 -
  /* U-Boot Commands */
 +#define CONFIG_SYS_NO_FLASH
  #include <config_cmd_default.h>
  #undef CONFIG_CMD_NET
  #undef CONFIG_CMD_NFS

diff --cc include/configs/mx28evk.h
index 877b811,885e513..07f88ca
--- 1/include/configs/mx28evk.h
--- 2/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@@ -6,26 -6,35 +6,18 @@@
   * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
   * on behalf of DENX Software Engineering GmbH
   *
-  * 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.
+  * SPDX-License-Identifier:   GPL-2.0+
   */
 -#ifndef __MX28EVK_CONFIG_H__
 -#define __MX28EVK_CONFIG_H__
 +#ifndef __CONFIGS_MX28EVK_H__
 +#define __CONFIGS_MX28EVK_H__
  
 -/* SoC configurations */
 +/* System configurations */
  #define CONFIG_MX28                           /* i.MX28 SoC */
 -
 -#define CONFIG_MXS_GPIO                       /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
 -
  #define CONFIG_MACH_TYPE      MACH_TYPE_MX28EVK
 -
 -#include <asm/arch/regs-base.h>
 -
 -#define CONFIG_SYS_NO_FLASH
 -#define CONFIG_BOARD_EARLY_INIT_F
 -#define CONFIG_ARCH_MISC_INIT
 -
 -/* SPL */
 -#define CONFIG_SPL
 -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 -#define CONFIG_SPL_START_S_PATH       "arch/arm/cpu/arm926ejs/mxs"
 -#define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 -#define CONFIG_SPL_LIBCOMMON_SUPPORT
 -#define CONFIG_SPL_LIBGENERIC_SUPPORT
 -#define CONFIG_SPL_GPIO_SUPPORT
 +#define CONFIG_SYS_PROMPT     "MX28EVK U-Boot > "
  
  /* U-Boot Commands */
 +#define CONFIG_SYS_NO_FLASH
  #include <config_cmd_default.h>
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DOS_PARTITION

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

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

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

diff --cc include/configs/sc_sps_1.h
index b7b46b4,9c2eb05..58ffa36
--- 1/include/configs/sc_sps_1.h
--- 2/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@@ -4,31 -4,50 +4,18 @@@
   * Copyright (C) 2012 Marek Vasut <marex@denx.de>
   * on behalf of DENX Software Engineering GmbH
   *
-  * 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 __SC_SPS_1_H__
 -#define __SC_SPS_1_H__
 +#ifndef __CONFIGS_SC_SPS_1_H__
 +#define __CONFIGS_SC_SPS_1_H__
  
 -/*
 - * SoC configurations
 - */
 +/* System configuration */
  #define CONFIG_MX28                           /* i.MX28 SoC */
 -#define CONFIG_MXS_GPIO                               /* GPIO control */
 -#define CONFIG_SYS_HZ         1000            /* Ticks per second */
 -
 -/*
 - * Define SC_SPS_1 machine type by hand until it lands in mach-types
 - */
  #define MACH_TYPE_SC_SPS_1    4172
 -
  #define CONFIG_MACH_TYPE      MACH_TYPE_SC_SPS_1
  
 -#include <asm/arch/regs-base.h>
 -
 +/* U-Boot Commands */
  #define CONFIG_SYS_NO_FLASH
 -#define CONFIG_BOARD_EARLY_INIT_F
 -#define CONFIG_ARCH_CPU_INIT
 -#define CONFIG_ARCH_MISC_INIT
 -
 -#define CONFIG_ENV_IS_IN_MMC
 -
 -#define CONFIG_OF_LIBFDT
 -
 -/*
 - * SPL
 - */
 -#define CONFIG_SPL
 -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 -#define CONFIG_SPL_START_S_PATH               "arch/arm/cpu/arm926ejs/mxs"
 -#define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 -#define CONFIG_SPL_LIBCOMMON_SUPPORT
 -#define CONFIG_SPL_LIBGENERIC_SUPPORT
 -#define CONFIG_SPL_GPIO_SUPPORT
 -
 -/*
 - * U-Boot Commands
 - */
  #include <config_cmd_default.h>
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DOS_PARTITION

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