Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 19 Mar 2017 18:49:26 +0000 (14:49 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 19 Mar 2017 19:13:38 +0000 (15:13 -0400)
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h

14 files changed:
1  2 
arch/arm/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/imx6ul-isiot.dtsi
configs/bk4r1_defconfig
configs/colibri_imx6_nospl_defconfig
configs/colibri_imx7_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/apalis_imx6.h
include/configs/colibri_imx6.h
include/configs/colibri_imx7.h
include/configs/colibri_vf.h
include/configs/pcm052.h
include/configs/vf610twr.h

Simple merge
Simple merge
index 0000000000000000000000000000000000000000,346079ac32116bd86169182be029745230cc11aa..9a3c35c56a0a93e571dcc12288748c6fd3221c1c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,142 +1,140 @@@
 -/dts-v1/;
 -
+ /*
+  * Copyright (C) 2016 Amarula Solutions B.V.
+  * Copyright (C) 2016 Engicam S.r.l.
+  *
+  * This file is dual-licensed: you can use it either under the terms
+  * of the GPL or the X11 license, at your option. Note that this dual
+  * licensing only applies to this file, and not this project as a
+  * whole.
+  *
+  *  a) This file is free software; you can redistribute it and/or
+  *     modify it under the terms of the GNU General Public License
+  *     version 2 as published by the Free Software Foundation.
+  *
+  *     This file 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.
+  *
+  * Or, alternatively
+  *
+  *  b) Permission is hereby granted, free of charge, to any person
+  *     obtaining a copy of this software and associated documentation
+  *     files (the "Software"), to deal in the Software without
+  *     restriction, including without limitation the rights to use
+  *     copy, modify, merge, publish, distribute, sublicense, and/or
+  *     sell copies of the Software, and to permit persons to whom the
+  *     Software is furnished to do so, subject to the following
+  *     conditions:
+  *
+  *     The above copyright notice and this permission notice shall be
+  *     included in all copies or substantial portions of the Software.
+  *
+  *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  *     OTHER DEALINGS IN THE SOFTWARE.
+  */
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ #include "imx6ul.dtsi"
+ / {
+       memory {
+               reg = <0x80000000 0x20000000>;
+       };
+       chosen {
+               stdout-path = &uart1;
+       };
+ };
+ &fec1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet1>;
+       phy-mode = "rmii";
+       status = "okay";
+ };
+ &i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1>;
+       status = "okay";
+ };
+ &i2c2 {
+       clock_frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+ };
+ &uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1>;
+       status = "okay";
+ };
+ &usdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+       cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+       bus-width = <4>;
+       no-1-8-v;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl_enet1: enet1grp {
+               fsl,pins = <
+                       MX6UL_PAD_ENET2_RX_DATA0__ENET1_MDIO    0x1b0b0
+                       MX6UL_PAD_ENET2_RX_DATA1__ENET1_MDC     0x1b0b0
+                       MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN      0x1b0b0
+                       MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
+                       MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
+                       MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN      0x1b0b0
+                       MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
+                       MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
+                       MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  0x4001b031
+                       MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10       0x1b0b0
+               >;
+       };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+                       MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+               >;
+       };
+       pinctrl_i2c2: i2c2grp {
+                       fsl,pins = <
+                       MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+                       MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+               >;
+       };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+                       MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+               >;
+       };
+       pinctrl_usdhc1: usdhc1grp {
+               fsl,pins = <
+                       MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x17059
+                       MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x10059
+                       MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
+                       MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
+                       MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
+                       MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
+               >;
+       };
+ };
index 1dff0d4629f44473217110526101b12367cc4c03,37a92bc33a134faf275e58541c700817e4665c24..173b2221519f016dec5081da40e79e4445093e3c
@@@ -1,5 -1,5 +1,6 @@@
  CONFIG_ARM=y
 +CONFIG_SYS_THUMB_BUILD=y
+ CONFIG_ARCH_VF610=y
  CONFIG_TARGET_BK4R1=y
  CONFIG_DEFAULT_DEVICE_TREE="bk4r1"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
Simple merge
Simple merge
index 6ba673da83a8ec0da02df5dea5ac8103d2e16626,9d94c61897d89851c481ad5bdbab8a0c3e10bf5d..0474abc3c590d5181349f11f909d5cd73c5e5e9c
@@@ -1,5 -1,5 +1,6 @@@
  CONFIG_ARM=y
 +CONFIG_SYS_THUMB_BUILD=y
+ CONFIG_ARCH_VF610=y
  CONFIG_TARGET_COLIBRI_VF=y
  CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
index 4f35a1c30019fb96f667ce40ccdd41d497070b38,b925aac022cd9e2bdd4aed3bc130d5725d5903fe..356268f65ff11b57facc7791cdc6acd13e7880b2
@@@ -1,5 -1,5 +1,6 @@@
  CONFIG_ARM=y
 +CONFIG_SYS_THUMB_BUILD=y
+ CONFIG_ARCH_VF610=y
  CONFIG_TARGET_PCM052=y
  CONFIG_DEFAULT_DEVICE_TREE="pcm052"
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
Simple merge
Simple merge
Simple merge
index 35f259cd00b581a98c340c644868732a4a569592,6d05f930d36f841ccb52d05589d5479bc7350da8..888899eacb349e5a61813849685014c771f4b1f1
@@@ -14,7 -14,7 +14,6 @@@
  
  #include <asm/arch/imx-regs.h>
  
- #define CONFIG_VF610
 -#define CONFIG_SYS_THUMB_BUILD
  #define CONFIG_SYS_FSL_CLK
  
  #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
index 87326871afd712744805427d0c4a5042642e041e,ba3b9750de0b1423fcd3e72e12fc7cddc24d8258..286598d2def8caa30c12bb821dfcd7c6724ebab6
@@@ -11,8 -11,8 +11,6 @@@
  
  #include <asm/arch/imx-regs.h>
  
- #define CONFIG_VF610
 -#define CONFIG_SYS_THUMB_BUILD
--
  #define CONFIG_SKIP_LOWLEVEL_INIT
  
  /* Enable passing of ATAGs */
Simple merge