From 1daf4d91d4f3c87f1e89fb57950506990b84c127 Mon Sep 17 00:00:00 2001
From: David Escalona <david.escalona@digi.com>
Date: Mon, 4 Sep 2017 12:26:36 +0200
Subject: [PATCH] libsoc: extend libsoc recipe with configuration params and
 custom board files

https://jira.digi.com/browse/DEL-4816

Signed-off-by: David Escalona <david.escalona@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../libsoc/libsoc-git/ccimx6sbc/board.conf    | 47 +++++++++++++++++++
 .../libsoc/libsoc-git/ccimx6ulsbc/board.conf  | 40 ++++++++++++++++
 .../libsoc-git/ccimx6ulstarter/board.conf     | 40 ++++++++++++++++
 .../libsoc/libsoc_git.bbappend                | 20 ++++++++
 4 files changed, 147 insertions(+)
 create mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf
 create mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
 create mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf
 create mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend

diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf
new file mode 100644
index 000000000..03c72acbd
--- /dev/null
+++ b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf
@@ -0,0 +1,47 @@
+[board]
+model = Digi International ConnectCore 6 Single Board Computer.
+
+[GPIO]
+
+# USER LED (RED) - GPIO02_IO02
+USER_LED = 34
+
+# USER LED (ORANGE) - GPIO02_IO03
+USER_LED_2 = 35
+
+# USER LED (GREEN) - GPIO02_IO04
+USER_LED_3 = 36
+
+# USER BUTTON - GPIO02_IO05
+USER_BUTTON = 37
+
+[I2C]
+
+# I2C-3 on I2C board connector.
+DEFAULT_I2C_BUS = 2
+
+[SPI]
+
+# SPI-1 on SPI board connector.
+DEFAULT_SPI_BUS = 0
+
+DEFAULT_SPI_SS = 0
+
+[PWM]
+
+# PWM1 on LCD board connector (pin 10).
+DEFAULT_PWM_CHIP = 0
+
+DEFAULT_PWM_SIGNAL = 0
+
+[ADC]
+
+# HWMON Driver
+DEFAULT_ADC_DRIVER = 1
+
+# IIO Device 0
+DEFAULT_DEVICE_INDEX = 0
+
+# PMIC_ADCIN1 on GPIO board connector (Pin 1)
+DEFAULT_ADC_LINE = 1
+
diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
new file mode 100644
index 000000000..8e873fa80
--- /dev/null
+++ b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
@@ -0,0 +1,40 @@
+[board]
+model = Digi International ConnectCore 6UL SBC.
+
+[GPIO]
+
+# USER LED - I/O Expander IO23
+USER_LED = 488
+
+# USER BUTTON - MCA_IO1
+USER_BUTTON = 505
+
+[I2C]
+
+# I2C-1 on I2C board connector.
+DEFAULT_I2C_BUS = 0
+
+[SPI]
+
+# SPI-1 on SPI board connector.
+DEFAULT_SPI_BUS = 0
+
+DEFAULT_SPI_SS = 0
+
+[PWM]
+
+# PWM4 on GPIO board connector (pin 11).
+DEFAULT_PWM_CHIP = 0
+
+DEFAULT_PWM_SIGNAL = 0
+
+[ADC]
+
+# IIO Driver
+DEFAULT_ADC_DRIVER = 0
+
+# IIO Device 0
+DEFAULT_DEVICE_INDEX = 0
+
+# ADC1_IN2 on GPIO board connector (pin 13)
+DEFAULT_ADC_LINE = 2
diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf
new file mode 100644
index 000000000..527c60589
--- /dev/null
+++ b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf
@@ -0,0 +1,40 @@
+[board]
+model = Digi International ConnectCore 6UL Starter Board.
+
+[GPIO]
+
+# USER LED - GPIO03_IO11
+USER_LED = 75
+
+# USER BUTTON - GPIO03_IO03
+USER_BUTTON = 67
+
+[I2C]
+
+# I2C-2 on Expansion connector.
+DEFAULT_I2C_BUS = 1
+
+[SPI]
+
+# SPI-3 on Expansion connector.
+DEFAULT_SPI_BUS = 2
+
+DEFAULT_SPI_SS = 0
+
+[PWM]
+
+# PWM1 on Expansion connector (pin 27).
+DEFAULT_PWM_CHIP = 0
+
+DEFAULT_PWM_SIGNAL = 0
+
+[ADC]
+
+# IIO Driver
+DEFAULT_ADC_DRIVER = 0
+
+# IIO Device 1
+DEFAULT_DEVICE_INDEX = 1
+
+# ADC1_IN4 on Expansion connector (pin 7).
+DEFAULT_ADC_LINE = 4
diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
new file mode 100644
index 000000000..959c174d3
--- /dev/null
+++ b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
@@ -0,0 +1,20 @@
+# Copyright (C) 2017 Digi International Inc.
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+
+LIBSOC_URI_STASH = "${DIGI_MTK_GIT}dey/libsoc.git;protocol=ssh"
+LIBSOC_URI_GITHUB = "git://github.com/jackmitch/libsoc.git;protocol=git"
+LIBSOC_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBSOC_URI_STASH}', '${LIBSOC_URI_GITHUB}', d)}"
+
+SRC_URI = " \
+    ${LIBSOC_URI};branch=${SRCBRANCH} \
+    file://board.conf \
+"
+
+PACKAGECONFIG = "enableboardconfig python"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/board.conf ${S}/contrib/board_files/${BOARD}.conf
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"