From bba0c0d7958d0c34fca419a2d70fb1198dca5ad5 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Tue, 10 Oct 2017 10:03:59 +0200
Subject: [PATCH] libsoc: Remove platform board.conf files

This commit removes the platform board.conf files from
libsoc.

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

https://jira.digi.com/browse/DEL-5096
---
 .../libsoc/libsoc-git/ccimx6sbc/board.conf    | 43 -------------------
 .../libsoc/libsoc-git/ccimx6ulsbc/board.conf  | 36 ----------------
 .../libsoc-git/ccimx6ulstarter/board.conf     | 36 ----------------
 .../libsoc/libsoc_git.bbappend                | 10 +----
 4 files changed, 1 insertion(+), 124 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf
 delete mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
 delete mode 100644 meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf

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
deleted file mode 100644
index c9559ae0f..000000000
--- a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6sbc/board.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-[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-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
deleted file mode 100644
index 06e16cfba..000000000
--- a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulsbc/board.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-[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-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf b/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf
deleted file mode 100644
index c26d171ad..000000000
--- a/meta-digi-dey/recipes-support/libsoc/libsoc-git/ccimx6ulstarter/board.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-[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-support/libsoc/libsoc_git.bbappend b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
index 959c174d3..04ef0b60d 100644
--- a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
+++ b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend
@@ -1,20 +1,12 @@
 # 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"
+PACKAGECONFIG = "python"
 
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/board.conf ${S}/contrib/board_files/${BOARD}.conf
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"