From e8f9a676bc16249d59fce062d9d0a669e5260a49 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 4 Sep 2018 17:12:09 -0400
Subject: skeleton: s2600wf: fix broken gpio config path

5ed9fa2b7a erroneously introduced some new files in a meta-intel
subdirectory.  Move the files to the correct location.

This can likely be blamed on the recent move to poky-style subtrees
as 5ed9fa2b7a was originally submitted to the old, pre-subtree openbmc
project repository.

(From meta-intel rev: 1947fda4c79e3028e8af7a1f0bdecb7be1fb6a01)

Change-Id: I9aab3002f096560e2cb376671eab02abdd2bdade
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../skeleton/obmc-libobmc-intf.bbappend            |  1 -
 .../skeleton/obmc-libobmc-intf/gpio_defs.json      | 47 ----------------------
 .../skeleton/obmc-libobmc-intf.bbappend            |  1 +
 .../skeleton/obmc-libobmc-intf/gpio_defs.json      | 47 ++++++++++++++++++++++
 4 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
 delete mode 100644 meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
 create mode 100644 meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
 create mode 100644 meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json

(limited to 'meta-intel')

diff --git a/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend b/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
deleted file mode 100644
index 72d991c7e..000000000
--- a/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
deleted file mode 100644
index b02709ec2..000000000
--- a/meta-intel/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "gpio_configs": {
-
-        "power_config": {
-            "power_good_in": "PGOOD",
-            "power_up_outs": [
-                {"name": "POWER_UP_PIN", "polarity": true}
-            ],
-            "reset_outs": [
-                {"name": "RESET_OUT", "polarity": false}
-            ]
-        }
-    },
-
-    "gpio_definitions": [
-        {
-            "name": "PGOOD",
-            "pin": "AB3",
-            "direction": "in"
-        },
-        {
-            "name": "POWER_BUTTON",
-            "pin": "E2",
-            "direction": "both"
-        },
-        {
-            "name": "POWER_UP_PIN",
-            "pin": "E3",
-            "direction": "out"
-        },
-        {
-            "name": "RESET_BUTTON",
-            "pin": "E0",
-            "direction": "both"
-        },
-        {
-            "name": "RESET_OUT",
-            "pin": "E1",
-            "direction": "out"
-        },
-        {
-            "name": "ID_BUTTON",
-            "pin": "S6",
-            "direction": "both"
-        }
-    ]
-}
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
new file mode 100644
index 000000000..72d991c7e
--- /dev/null
+++ b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
new file mode 100644
index 000000000..b02709ec2
--- /dev/null
+++ b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
@@ -0,0 +1,47 @@
+{
+    "gpio_configs": {
+
+        "power_config": {
+            "power_good_in": "PGOOD",
+            "power_up_outs": [
+                {"name": "POWER_UP_PIN", "polarity": true}
+            ],
+            "reset_outs": [
+                {"name": "RESET_OUT", "polarity": false}
+            ]
+        }
+    },
+
+    "gpio_definitions": [
+        {
+            "name": "PGOOD",
+            "pin": "AB3",
+            "direction": "in"
+        },
+        {
+            "name": "POWER_BUTTON",
+            "pin": "E2",
+            "direction": "both"
+        },
+        {
+            "name": "POWER_UP_PIN",
+            "pin": "E3",
+            "direction": "out"
+        },
+        {
+            "name": "RESET_BUTTON",
+            "pin": "E0",
+            "direction": "both"
+        },
+        {
+            "name": "RESET_OUT",
+            "pin": "E1",
+            "direction": "out"
+        },
+        {
+            "name": "ID_BUTTON",
+            "pin": "S6",
+            "direction": "both"
+        }
+    ]
+}
-- 
cgit v1.2.3