From b56c4ecc650c74c18da7694cec387a8d55ef41ca Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Tue, 10 Oct 2017 14:09:06 +0200
Subject: [PATCH] libdigiapix: Add platform board files

This commit adds the some platform board files and removes
the symbolic link to libsoc.conf

Signed-off-by: Mike Engel <Mike.Engel@digi.com>

https://jira.digi.com/browse/DEL-5096
---
 .../libdigiapix-git/ccimx6sbc/board.conf      | 43 +++++++++++++++++++
 .../libdigiapix-git/ccimx6ulsbc/board.conf    | 36 ++++++++++++++++
 .../ccimx6ulstarter/board.conf                | 36 ++++++++++++++++
 .../libdigiapix/libdigiapix_git.bb            |  9 ++--
 4 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/board.conf
 create mode 100644 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/board.conf
 create mode 100644 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/board.conf

diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/board.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/board.conf
new file mode 100644
index 000000000..c9559ae0f
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/board.conf
@@ -0,0 +1,43 @@
+[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 = 0,0
+
+[PWM]
+
+# PWM1 on LCD board connector (pin 10).
+DEFAULT_PWM = 0,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-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/board.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/board.conf
new file mode 100644
index 000000000..06e16cfba
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/board.conf
@@ -0,0 +1,36 @@
+[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 = 0,0
+
+[PWM]
+
+# PWM4 on GPIO board connector (pin 11).
+DEFAULT_PWM = 0,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-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/board.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/board.conf
new file mode 100644
index 000000000..c26d171ad
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/board.conf
@@ -0,0 +1,36 @@
+[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 = 2,0
+
+[PWM]
+
+# PWM1 on Expansion connector (pin 27).
+DEFAULT_PWM = 0,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-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index e10d4ef6a..35a5fa76e 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -16,7 +16,10 @@ LIBDIGIAPIX_URI_GITHUB = "git://github.com/digi-embedded/libdigiapix.git;protoco
 
 LIBDIGIAPIX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}"
 
-SRC_URI = "${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH}"
+SRC_URI = " \
+    ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \
+    file://board.conf \
+"
 
 S = "${WORKDIR}/git"
 
@@ -25,8 +28,8 @@ inherit pkgconfig
 do_install() {
 	oe_runmake 'DESTDIR=${D}' install
 
-	# Create a link to 'libsoc.conf' file that is installed by libsoc recipe
 	install -d ${D}${sysconfdir}/
-	ln -sf libsoc.conf ${D}${sysconfdir}/${BPN}.conf
+	install -m 0644 ${WORKDIR}/board.conf ${D}${sysconfdir}/libdigiapix.conf
 }
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"