summaryrefslogtreecommitdiff
path: root/recipes-devtools
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-02-08 09:53:52 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-02-14 10:11:42 +0100
commit93ca71e9e124a34446c8a624becbe992cc94ce9b (patch)
tree5b84ca9caa7b73fca1ca8bf5f4e119fe3ab0cbe2 /recipes-devtools
parentafe06f775b19f60ee2e8bcba2494b61d3d7eef10 (diff)
downloadmeta-yogurt-93ca71e9e124a34446c8a624becbe992cc94ce9b.tar.bz2
meta-yogurt-93ca71e9e124a34446c8a624becbe992cc94ce9b.zip
mraa: fix platform init
There is a little difference in devicetree between morty and rocko. On banch morty the board is named 'phyBOARD-MIRA' and on rocko it is named 'phyBOARD-Mira'. So I simply added this one to the init to match both situations. Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/mraa/mraa/0002-phyboard-mira-add-platform-support.patch27
1 files changed, 15 insertions, 12 deletions
diff --git a/recipes-devtools/mraa/mraa/0002-phyboard-mira-add-platform-support.patch b/recipes-devtools/mraa/mraa/0002-phyboard-mira-add-platform-support.patch
index ab30f3b..e2a988f 100644
--- a/recipes-devtools/mraa/mraa/0002-phyboard-mira-add-platform-support.patch
+++ b/recipes-devtools/mraa/mraa/0002-phyboard-mira-add-platform-support.patch
@@ -1,6 +1,6 @@
-From 46f3c16465ff77ab3a36125791c98af71dd23ad8 Mon Sep 17 00:00:00 2001
+From ad62486df06b1829bd46714b22b34fa1fe246693 Mon Sep 17 00:00:00 2001
From: Norbert Wesp <n.wesp@phytec.de>
-Date: Mon, 10 Dec 2018 16:00:41 +0100
+Date: Fri, 8 Feb 2019 09:32:57 +0100
Subject: [PATCH] phyboard-mira: add platform support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -10,20 +10,22 @@ Add platform support in mraa v2.0.0
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Signed-off-by: Norbert Wesp <n.wesp@phytec.de>
+
+%% original patch: 0002-phyboard-mira-add-platform-support.patch
---
README.md | 2 +
api/mraa/types.h | 1 +
api/mraa/types.hpp | 1 +
docs/index.java.md | 1 +
docs/index.md | 1 +
- docs/phyboard-mira.md | 151 ++++++++++++++++++++++
- include/arm/mira.h | 51 ++++++++
+ docs/phyboard-mira.md | 151 ++++++++++++++++++++++++++++
+ include/arm/mira.h | 51 ++++++++++
src/CMakeLists.txt | 1 +
- src/arm/arm.c | 8 +-
- src/arm/mira.c | 205 ++++++++++++++++++++++++++++++
+ src/arm/arm.c | 9 +-
+ src/arm/mira.c | 205 ++++++++++++++++++++++++++++++++++++++
src/arm/phyboard.c | 1 +
src/python/python2/docs/index.rst | 1 +
- 12 files changed, 423 insertions(+), 1 deletion(-)
+ 12 files changed, 424 insertions(+), 1 deletion(-)
create mode 100644 docs/phyboard-mira.md
create mode 100644 include/arm/mira.h
create mode 100644 src/arm/mira.c
@@ -316,7 +318,7 @@ index 35c5488..ecf7204 100644
${PROJECT_SOURCE_DIR}/src/arm/de_nano_soc.c
)
diff --git a/src/arm/arm.c b/src/arm/arm.c
-index 62d6b2e..eb6753e 100644
+index 62d6b2e..b4c4e37 100644
--- a/src/arm/arm.c
+++ b/src/arm/arm.c
@@ -31,6 +31,7 @@
@@ -327,16 +329,17 @@ index 62d6b2e..eb6753e 100644
#include "arm/raspberry_pi.h"
#include "mraa_internal.h"
-@@ -102,6 +103,8 @@ mraa_arm_platform()
+@@ -102,6 +103,9 @@ mraa_arm_platform()
platform_type = MRAA_96BOARDS;
else if (mraa_file_contains("/proc/device-tree/compatible", "raspberrypi,"))
platform_type = MRAA_RASPBERRY_PI;
-+ else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "phyBOARD-MIRA"))
++ else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "phyBOARD-MIRA") ||
++ mraa_file_contains("/sys/firmware/devicetree/base/model", "phyBOARD-Mira"))
+ platform_type = MRAA_PHYBOARD_MIRA;
}
switch (platform_type) {
-@@ -114,7 +117,10 @@ mraa_arm_platform()
+@@ -114,7 +118,10 @@ mraa_arm_platform()
case MRAA_PHYBOARD_WEGA:
plat = mraa_phyboard();
break;
@@ -584,5 +587,5 @@ index 4a4ff77..5cb7321 100644
* `UP <../up.html>`_
* `UP Squared<../up2.html>`_
--
-2.17.1
+2.7.4