From 299b3cd91320b47203f662428b28d60d94c5067b Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Thu, 11 Apr 2019 13:29:04 -0700
Subject: meta-quanta: gsj: move phosphor-ipmi-host under ipmi

Move the phosphor-ipmi-host modifications under the ipmi folder to
mirror the meta-phosphor layout.

(From meta-quanta rev: f10e2e0bd89eb10638afd92bde04dc4fca216f9c)

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I13826bdf82c0a05d8a6b22de098bc9dabf724bed
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../phosphor-ipmi-host/gsj-ipmid-whitelist.conf    | 47 ++++++++++++++++++++++
 .../ipmi/phosphor-ipmi-host_%.bbappend             |  7 ++++
 .../phosphor-ipmi-host/gsj-ipmid-whitelist.conf    | 47 ----------------------
 .../recipes-phosphor/phosphor-ipmi-host_%.bbappend |  7 ----
 4 files changed, 54 insertions(+), 54 deletions(-)
 create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
 create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
 delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
 delete mode 100644 meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend

(limited to 'meta-quanta/meta-gsj')

diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
new file mode 100644
index 000000000..a0d18b480
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
@@ -0,0 +1,47 @@
+#<NetFn>:<Command>
+0x00:0x00    //<Chassis>:<Chassis Capabiliti>
+0x00:0x01    //<Chassis>:<Get Chassis Status>
+0x00:0x02    //<Chassis>:<Chassis Control>
+0x00:0x05    //<Chassis>:<Set Chassis Capabilities>
+0x00:0x06    //<Chassis>:<Set Power Restore Policy>
+0x00:0x08    //<Chassis>:<Set System Boot Options>
+0x00:0x09    //<Chassis>:<Get System Boot Options>
+0x00:0x0F    //<Chassis>:<Get POH Counter Command>
+0x04:0x02    //<Sensor/Event>:<Platform event>
+0x04:0x2D    //<Sensor/Event>:<Get Sensor Reading>
+0x04:0x2F    //<Sensor/Event>:<Get Sensor Type>
+0x04:0x30    //<Sensor/Event>:<Set Sensor Reading and Event Status>
+0x06:0x01    //<App>:<Get Device ID>
+0x06:0x04    //<App>:<Get Self Test Results>
+0x06:0x06    //<App>:<Set ACPI Power State>
+0x06:0x07    //<App>:<Get ACPI Power State>
+0x06:0x08    //<App>:<Get Device GUID>
+0x06:0x22    //<App>:<Reset Watchdog Timer>
+0x06:0x24    //<App>:<Set Watchdog Timer>
+0x06:0x25    //<App>:<Get Watchdog Timer>
+0x06:0x2E    //<App>:<Set BMC Global Enables>
+0x06:0x2F    //<App>:<Get BMC Global Enables>
+0x06:0x31    //<App>:<Get Message Flags>
+0x06:0x35    //<App>:<Read Event Message Buffer>
+0x06:0x36    //<App>:<Get BT Interface Capabilities>
+0x06:0x37    //<App>:<Get System GUID>
+0x06:0x42    //<App>:<Get Channel Info Command>
+0x06:0x54    //<App>:<Get Channel Cipher Suites>
+0x0A:0x10    //<Storage>:<Get FRU Inventory Area Info>
+0x0A:0x11    //<Storage>:<Read FRU Data>
+0x0A:0x20    //<Storage>:<Get SDR Repository Info>
+0x0A:0x22    //<Storage>:<Reserve SDR Repository>
+0x0A:0x23    //<Storage>:<Get SDR>
+0x0A:0x40    //<Storage>:<Get SEL Info>
+0x0A:0x42    //<Storage>:<Reserve SEL>
+0x0A:0x44    //<Storage>:<Add SEL Entry>
+0x0A:0x48    //<Storage>:<Get SEL Time>
+0x0A:0x49    //<Storage>:<Set SEL Time>
+0x0C:0x02    //<Transport>:<Get LAN Configuration Parameters>
+0x2C:0x00    //<Group Extension>:<Group Extension Command>
+0x2C:0x01    //<Group Extension>:<Get DCMI Capabilities>
+0x2C:0x02    //<Group Extension>:<Get Power Reading>
+0x2C:0x03    //<Group Extension>:<Get Power Limit>
+0x2C:0x06    //<Group Extension>:<Get Asset Tag>
+0x2C:0x07    //<Group Extension>:<Get Sensor Info>
+0x2C:0x10    //<Group Extension>:<Get Temperature Readings>
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
new file mode 100644
index 000000000..8b24bf754
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# Replace the default whitelist for GSJ board.
+SRC_URI += " file://gsj-ipmid-whitelist.conf"
+
+WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf"
+WHITELIST_CONF_append = " ${WORKDIR}/gsj-ipmid-whitelist.conf"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf b/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
deleted file mode 100644
index a0d18b480..000000000
--- a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-#<NetFn>:<Command>
-0x00:0x00    //<Chassis>:<Chassis Capabiliti>
-0x00:0x01    //<Chassis>:<Get Chassis Status>
-0x00:0x02    //<Chassis>:<Chassis Control>
-0x00:0x05    //<Chassis>:<Set Chassis Capabilities>
-0x00:0x06    //<Chassis>:<Set Power Restore Policy>
-0x00:0x08    //<Chassis>:<Set System Boot Options>
-0x00:0x09    //<Chassis>:<Get System Boot Options>
-0x00:0x0F    //<Chassis>:<Get POH Counter Command>
-0x04:0x02    //<Sensor/Event>:<Platform event>
-0x04:0x2D    //<Sensor/Event>:<Get Sensor Reading>
-0x04:0x2F    //<Sensor/Event>:<Get Sensor Type>
-0x04:0x30    //<Sensor/Event>:<Set Sensor Reading and Event Status>
-0x06:0x01    //<App>:<Get Device ID>
-0x06:0x04    //<App>:<Get Self Test Results>
-0x06:0x06    //<App>:<Set ACPI Power State>
-0x06:0x07    //<App>:<Get ACPI Power State>
-0x06:0x08    //<App>:<Get Device GUID>
-0x06:0x22    //<App>:<Reset Watchdog Timer>
-0x06:0x24    //<App>:<Set Watchdog Timer>
-0x06:0x25    //<App>:<Get Watchdog Timer>
-0x06:0x2E    //<App>:<Set BMC Global Enables>
-0x06:0x2F    //<App>:<Get BMC Global Enables>
-0x06:0x31    //<App>:<Get Message Flags>
-0x06:0x35    //<App>:<Read Event Message Buffer>
-0x06:0x36    //<App>:<Get BT Interface Capabilities>
-0x06:0x37    //<App>:<Get System GUID>
-0x06:0x42    //<App>:<Get Channel Info Command>
-0x06:0x54    //<App>:<Get Channel Cipher Suites>
-0x0A:0x10    //<Storage>:<Get FRU Inventory Area Info>
-0x0A:0x11    //<Storage>:<Read FRU Data>
-0x0A:0x20    //<Storage>:<Get SDR Repository Info>
-0x0A:0x22    //<Storage>:<Reserve SDR Repository>
-0x0A:0x23    //<Storage>:<Get SDR>
-0x0A:0x40    //<Storage>:<Get SEL Info>
-0x0A:0x42    //<Storage>:<Reserve SEL>
-0x0A:0x44    //<Storage>:<Add SEL Entry>
-0x0A:0x48    //<Storage>:<Get SEL Time>
-0x0A:0x49    //<Storage>:<Set SEL Time>
-0x0C:0x02    //<Transport>:<Get LAN Configuration Parameters>
-0x2C:0x00    //<Group Extension>:<Group Extension Command>
-0x2C:0x01    //<Group Extension>:<Get DCMI Capabilities>
-0x2C:0x02    //<Group Extension>:<Get Power Reading>
-0x2C:0x03    //<Group Extension>:<Get Power Limit>
-0x2C:0x06    //<Group Extension>:<Get Asset Tag>
-0x2C:0x07    //<Group Extension>:<Get Sensor Info>
-0x2C:0x10    //<Group Extension>:<Get Temperature Readings>
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend
deleted file mode 100644
index 8b24bf754..000000000
--- a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# Replace the default whitelist for GSJ board.
-SRC_URI += " file://gsj-ipmid-whitelist.conf"
-
-WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf"
-WHITELIST_CONF_append = " ${WORKDIR}/gsj-ipmid-whitelist.conf"
-- 
cgit v1.2.1