From 313d902a8b0d808f225bd2e28370410dadd68248 Mon Sep 17 00:00:00 2001
From: Isaac Hermida <isaac.hermida@digi.com>
Date: Wed, 11 May 2016 14:01:30 +0200
Subject: [PATCH] Initial support for ccimx6ulstarter platform

Added initial support for Digi's ConnectCore 6UL Starter Board.

https://jira.digi.com/browse/DEL-2380
https://jira.digi.com/browse/DEL-2529

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
---
 .../conf/machine/ccimx6ulstarter.conf         | 37 ++++++-------------
 .../conf/machine/include/ccimx6ul.inc         | 26 ++++++-------
 .../conf/machine/include/digi-defaults.inc    |  1 +
 3 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
index 31804f96e..978982153 100644
--- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -1,39 +1,24 @@
 #@TYPE: Machine
-#@NAME: ConnectCore 6 Single Board Computer.
-#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 SBC.
+#@NAME: Starter Board for ConnectCore for i.MX6UL
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL Starter Board.
 
-# Contains the ConnectCore 6 module.
-include conf/machine/include/ccimx6.inc
+# Include the machine configuration for Digi's ConnectCore 6UL.
+include conf/machine/include/ccimx6ul.inc
 
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
-UBOOT_CONFIG ??= "ccimx6dlsbc512MB ccimx6dlsbc ccimx6qsbc2GB ccimx6qsbc512MB ccimx6qsbc"
-UBOOT_CONFIG[ccimx6dlsbc512MB] = "ccimx6dlsbc512MB_defconfig"
-UBOOT_CONFIG[ccimx6dlsbc] = "ccimx6dlsbc_defconfig"
-UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig"
-UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig"
-UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig"
+UBOOT_CONFIG ??= "ccimx6ulstarter"
+UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulsbc_defconfig"
 
 KERNEL_DEVICETREE ?= " \
-    imx6dl-ccimx6sbc.dtb \
-    imx6dl-ccimx6sbc-w.dtb \
-    imx6dl-ccimx6sbc-wb.dtb \
-    imx6q-ccimx6sbc.dtb \
-    imx6q-ccimx6sbc-w.dtb \
-    imx6q-ccimx6sbc-wb.dtb \
-    imx6q-ccimx6sbc-wb-ldo-bypass.dtb \
-    imx6q-ccimx6sbc-id129.dtb \
-    imx6q-ccimx6sbc-id130.dtb \
-    imx6dl-ccimx6sbc-id131.dtb \
+    imx6ul-ccimx6ulstarter.dtb \
+    imx6ul-ccimx6ulstarter-wb.dtb \
 "
 
-SERIAL_CONSOLES = "115200;ttymxc3"
+SERIAL_CONSOLES = "115200;ttymxc1"
 
 # Bluetooth tty
-BT_TTY ?= "ttymxc1"
-
-# U-Boot script to be copied to the boot image
-BOOT_SCRIPTS = "boot.scr:boot.scr"
+BT_TTY ?= "ttymxc0"
 
 # Flash image types
-IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2"
+IMAGE_FSTYPES ?= "tar.bz2 ubifs sdcard"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index b5a22f3aa..75e81e4ba 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -1,15 +1,14 @@
 #@TYPE: Machine
-#@NAME: ConnectCore 6 module.
-#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module.
+#@NAME: ConnectCore for i.MX6UL.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL.
 
 include conf/machine/include/imx-digi-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/tune-cortexa7.inc
 
-DIGI_FAMILY = "ccimx6"
-SOC_FAMILY  = "mx6:mx6dl:mx6q:${DIGI_FAMILY}"
+DIGI_FAMILY = "ccimx6ul"
+SOC_FAMILY  = "mx6ul:${DIGI_FAMILY}"
 
 # Platform u-boot settings
-UBOOT_ENTRYPOINT = "0x10800000"
 UBOOT_SUFFIX = "imx"
 UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
 
@@ -18,18 +17,15 @@ WIRELESS_MODULE ?= ""
 
 # Firmware
 MACHINE_FIRMWARE ?= ""
-MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
-MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d"
-MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
-MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"
 
 MACHINE_EXTRA_RDEPENDS += " \
-    e2fsprogs-mke2fs \
-    e2fsprogs-resize2fs \
-    parted \
-    u-boot-fw-utils \
+    mtd-utils-ubifs \
 "
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
 MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
 
-MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"
+MACHINE_FEATURES += "wifi bluetooth"
+
+KERNEL_IMAGETYPE = "zImage"
+# FLASH parameters
+MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index ea23756f6..f1c642a09 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 # -------------------------------------------------
 # ccardimx28    3.10               2013.01
 # ccimx6        3.14               2015.04
+# ccimx6ul      4.1                2015.04
 #
 
 # Help variables used in recipes