board: Add support for Engicam i.CoreM6 DualLite/Solo boards

Add initial support for Engicam i.CoreM6 DualLite/Solo board
with below features:
- U-Boot 2017.07-rc1
- Linux 4.11.5
- Default packages from buildroot

U-Boot 2017.07-rc1 has common u-boot defconfig for All i.CoreM6
variant boards, so this patch update the same along with
buildroot defconfig that reflect the common name.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe2c7fe4b906e98ab68548a435fc9d29493d05f2..6f03be43093f93049538b42af2c636f7835b766a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ ci20_defconfig: *defconfig
 ci40_defconfig: *defconfig
 csky_gx6605s_defconfig: *defconfig
 cubieboard2_defconfig: *defconfig
-engicam_imx6q_icore_defconfig: *defconfig
+engicam_imx6qdl_icore_defconfig: *defconfig
 firefly_rk3288_defconfig: *defconfig
 firefly_rk3288_demo_defconfig: *defconfig
 freescale_imx28evk_defconfig: *defconfig

diff --git a/DEVELOPERS b/DEVELOPERS
index 41940b495b2a768ce38861bdec504829924e7f21..30f4c97183baf1d3d6cbb49ab0262559461b331c 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -843,7 +843,7 @@ F:  package/keepalived/
 
 N:     Jagan Teki <jagan@amarulasolutions.com>
 F:     board/engicam/
-F:     configs/engicam_imx6q_icore_defconfig
+F:     configs/engicam_imx6qdl_icore_defconfig
 
 N:     James Knight <james.knight@rockwellcollins.com>
 F:     package/atkmm/

diff --git a/board/engicam/genimage.cfg b/board/engicam/genimage.cfg
index 43c81cfd9e9426cb088eeca8794db29b3ab1f4bf..f409a080933a807b46c9d09feca6c9f967493c41 100644 (file)
--- a/board/engicam/genimage.cfg
+++ b/board/engicam/genimage.cfg
@@ -2,10 +2,11 @@ image boot.vfat {
        vfat {
                files = {
                        "uImage",
+                       "imx6dl-icore.dtb",
                        "imx6q-icore.dtb"
                }
        }
-       size = 16M
+       size = 64M
 }
 
 image sdcard.img {

diff --git a/board/engicam/readme.txt b/board/engicam/readme.txt
index eb7503f6295cd2323aca5b62bd89e921af59f77c..f1010a230860e33d9602d8107dfb9994c922fe2a 100644 (file)
--- a/board/engicam/readme.txt
+++ b/board/engicam/readme.txt
@@ -5,7 +5,7 @@ Buildroot for Engicam i.MX6 SOM platforms:
 This file documents the Buildroot support for all Engicam i.MX6 SOM
 platform boards.
 
-i.CoreM6 Quad/Dual SOM Starter kits:
+i.CoreM6 Quad/Dual/DualLite/Solo SOM Starter kits:
 https://www.engicam.com/vis-prod/101120
 
 This configuration uses U-Boot mainline and kernel mainline.
@@ -17,7 +17,7 @@ First, configure Buildroot for the Engicam i.MX SOM's:
 
 - for i.CoreM6 Quad/Dual:
 
-  make engicam_imx6q_icore_defconfig
+  make engicam_imx6qdl_icore_defconfig
 
 Build all components:
 
@@ -26,6 +26,8 @@ Build all components:
 You will find the following files in output/images/:
 - for i.CoreM6 Quad/Dual:
   - imx6q-icore.dtb
+- for i.CoreM6 DualLite/Solo:
+  - imx6dl-icore.dtb
   - rootfs.ext4
   - rootfs.tar
   - sdcard.img
@@ -46,6 +48,7 @@ directory, ready to be dumped on a SD card. Launch the following
 command as root:
 
   dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+  sync
 
 *** WARNING! This will destroy all the card content. Use with care! ***
 

diff --git a/configs/engicam_imx6q_icore_defconfig b/configs/engicam_imx6q_icore_defconfig
deleted file mode 100644 (file)
index 63454ee..0000000
--- a/configs/engicam_imx6q_icore_defconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.11 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6q_icore_mmc"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="SPL"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-icore"
-
-# Filesystem
-BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual Starter Kit"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/genimage.cfg"

diff --git a/configs/engicam_imx6qdl_icore_defconfig b/configs/engicam_imx6qdl_icore_defconfig
new file mode 100644 (file)
index 0000000..e0d89fa
--- /dev/null
+++ b/configs/engicam_imx6qdl_icore_defconfig
@@ -0,0 +1,41 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo Starter Kit"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/genimage.cfg"