Move meta-fsl-arm specific files to separate layer

Create new layer for recipes and files that required only when
meta-fsl-arm and meta-fsl-arm-extra layers are used. For now,
the bblayers.conf template still includes the new layer as well.

Change-Id: I01a0019ebaea3e1532f106e076f7608fb7aa86c6
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>

5 files changed, 292 insertions, 0 deletions

diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
new file mode 100644
index 0000000..59a4505
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
+From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 9 May 2014 10:23:50 +0300
+Subject: [PATCH] Updated kernel arguments for sabre sd
+
+- Enable I2C
+- detect if hdmi is used and change video arguments accordingly
+- disable blanking and cursor blinking
+
+---
+ board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
+ include/configs/mx6sabre_common.h       | 21 +++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
+index 12d8c56..303b774 100644
+--- a/board/freescale/mx6sabresd/mx6sabresd.c
++++ b/board/freescale/mx6sabresd/mx6sabresd.c
+@@ -12,6 +12,7 @@
+ #include <asm/arch/mx6-pins.h>
+ #include <asm/errno.h>
+ #include <asm/gpio.h>
++#include <asm/imx-common/mxc_i2c.h>
+ #include <asm/imx-common/iomux-v3.h>
+ #include <asm/imx-common/boot_mode.h>
+ #include <mmc.h>
+@@ -24,6 +25,7 @@
+ #include <ipu_pixfmt.h>
+ #include <asm/io.h>
+ #include <asm/arch/sys_proto.h>
++#include <i2c.h>
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+ #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
+@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
+                      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
+ 
++#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                   \
++       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |   \
++       PAD_CTL_ODE | PAD_CTL_SRE_FAST)
++
++#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
++
+ int dram_init(void)
+ {
+        gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
+        MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
++static struct i2c_pads_info i2c_pad_info1 = {
++       .scl = {
++               .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
++               .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
++               .gp = IMX_GPIO_NR(4, 12)
++       },
++       .sda = {
++               .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
++               .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
++               .gp = IMX_GPIO_NR(4, 13)
++       }
++};
++
+ static void setup_spi(void)
+ {
+        imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
+@@ -477,6 +498,8 @@ int board_init(void)
+        setup_spi();
+ #endif
+ 
++       setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
++
+        return 0;
+ }
+ 
+diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
+index 5ee7fa5..b83bf74 100644
+--- a/include/configs/mx6sabre_common.h
++++ b/include/configs/mx6sabre_common.h
+@@ -85,6 +85,13 @@
+ /* Command definition */
+ #include <config_cmd_default.h>
+ 
++/* I2C Configs */
++#define CONFIG_CMD_I2C
++#define CONFIG_SYS_I2C
++#define CONFIG_SYS_I2C_MXC
++#define CONFIG_SYS_I2C_SPEED           100000
++#define CONFIG_I2C_EDID
++
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_BOOTZ
+ #define CONFIG_CMD_SETEXPR
+@@ -117,6 +124,15 @@
+ #define EMMC_ENV ""
+ #endif
+ 
++#define VIDEOARGS \
++       "videoargs=" \
++       "i2c dev 1 ; " \
++       "if i2c probe 0x50 ; then " \
++               "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
++       "else " \
++               "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
++       "fi\0"
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+        "script=boot.scr\0" \
+        "uimage=uImage\0" \
+@@ -144,7 +160,11 @@
+                        "fi; "  \
+                "fi\0" \
+        EMMC_ENV          \
++       VIDEOARGS \
+        "mmcargs=setenv bootargs console=${console},${baudrate} " \
++               "video=${video} "\
++               "consoleblank=0 " \
++               "vt.global_cursor_default=0 " \
+                "root=${mmcroot}\0" \
+        "loadbootscript=" \
+                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+@@ -153,6 +173,7 @@
+        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+        "mmcboot=echo Booting from mmc ...; " \
++               "run videoargs; " \
+                "run mmcargs; " \
+                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+                        "if run loadfdt; then " \
+-- 
+1.8.3.2
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
new file mode 100644
index 0000000..b4ff56f
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
+        "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
new file mode 100644
index 0000000..d97921c
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
@@ -0,0 +1,25 @@
+From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 10 Jan 2014 12:37:20 +0200
+Subject: [PATCH] nitrogen6x: disable console cursor blinking
+
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+index d933fa0..2d7c575 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
+ done
+ 
+ setenv bootargs $bootargs $fbmem
+-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
++setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
+ 
+ if itest.s x$bootpart == x ; then
+        bootpart=1
+-- 
+1.7.10.4
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
new file mode 100644
index 0000000..995e418
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
@@ -0,0 +1,81 @@
+From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001
+From: Rainer Keller <rainer.keller@digia.com>
+Date: Fri, 5 Sep 2014 14:39:50 +0200
+Subject: [PATCH] Add support for update recovery linux
+
+---
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+index 5bc6170..4116ed4 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+@@ -1,3 +1,64 @@
++# Boot2Qt update part begin
++echo "Boot to Qt"
++if test "x$boot2qt_update_state" = "x" ; then
++  setenv boot2qt_update_state valid
++  saveenv
++fi
++
++# This is a workaround because environment partition is read-only.
++if fatload mmc 1:1 0x12000000 update/state ; then
++    mw.b 0x13000000 0x76 1 # v
++    mw.b 0x13000001 0x75 1 # u
++    mw.b 0x13000002 0x74 1 # t
++
++    if cmp.b 0x12000000 0x13000000 1 ; then
++        echo "State: Valid"
++        setenv boot2qt_fat_state valid
++        setenv boot2qt_update_state valid
++        saveenv
++    fi
++    if cmp.b 0x12000000 0x13000001 1 ; then
++        echo "State: Update"
++        setenv boot2qt_fat_state update
++    fi
++    if cmp.b 0x12000000 0x13000002 1 ; then
++        echo "State: Testing"
++        setenv boot2qt_fat_state testing
++    fi
++fi
++
++if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then
++  setenv boot2qt_update_state testing
++  saveenv
++  echo "Recovery linux starting..."
++  setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0"
++
++  # Guess dtb name
++  dtbname="imx6";
++  if itest.s x6S != "x\$cpu" ; then
++    dtbname=\${dtbname}q-;
++  else
++    dtbname=\${dtbname}s-;
++  fi
++
++  if itest.s x == "x\$board" ; then
++    board=sabrelite
++  fi
++  dtbname=\${dtbname}\${board}.dtb;
++
++  fatload mmc 1:1 0x10800000 update/uImage
++  fatload mmc 1:1 0x12000000 update/${dtbname}
++  fatload mmc 1:1 0x13000000 update/uRamdisk
++  bootm 0x10800000 0x13000000 0x12000000
++fi
++
++if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then
++  setenv boot2qt_update_state invalid
++  saveenv
++fi
++
++# Boot2Qt update part end
++
+ # Yocto-specifics
+ setenv bootpart 2
+ setenv bootdir /
+-- 
+1.8.5.5
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
new file mode 100644
index 0000000..a479c2b
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -0,0 +1,27 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-nitrogen6x-disable-console-cursor-blinking.patch \
+        file://0002-nitrogen6x-update.patch \
+        "