Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

5 files changed, 19 insertions, 208 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch
index 5b86d3154..3ca81c388 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch
@@ -1,22 +1,22 @@
-From 066ecddebc29a87b05f8c66491eec19bb27d1d33 Mon Sep 17 00:00:00 2001
+From 068b816b3c9bf75dcd2a808fc81c67a32fbe29ea Mon Sep 17 00:00:00 2001
 From: David Cobbley <david.j.cobbley@linux.intel.com>
 Date: Wed, 6 Jun 2018 10:11:58 -0700
-Subject: [PATCH 3/3] Modify Dbus for IPv6.
+Subject: [PATCH] Modify Dbus for IPv6.
 
 Add additional interfaces for IPv6 use.
 ---
- .../Network/EthernetInterface.interface.yaml           | 18 ++++++++++++++++++
- xyz/openbmc_project/Network/IP.interface.yaml          |  4 ++++
- 2 files changed, 22 insertions(+)
+ .../Network/EthernetInterface.interface.yaml            | 17 ++++++++++++++++-
+ xyz/openbmc_project/Network/IP.interface.yaml           |  4 ++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
-index fc744fc..fd19e27 100644
+index 744ac77..6b7cd9a 100644
 --- a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
 +++ b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
-@@ -37,3 +37,21 @@ properties:
-           Implementation of this Dbus-interface is required to implement this property.
-           This property supports read/write operation.
-           Configure the NTP servers on the system during write operation.
+@@ -42,6 +42,14 @@ properties:
+       description: >
+           This indicates link local auto configuration on this ethernet
+           interface and configured on this ethernet interface.
 +    - name: IPv6AcceptRA
 +      type: boolean
 +      description: >
@@ -25,8 +25,14 @@ index fc744fc..fd19e27 100644
 +      type: enum[self.IPAllowed]
 +      description: >
 +          The type of IP connection is allowed on this channel
-+
-+enumerations:
+ 
+ enumerations:
+     - name: LinkLocalConf
+@@ -52,4 +60,11 @@ enumerations:
+         - name: v4
+         - name: v6
+         - name: none
+-
 +    - name: IPAllowed
 +      description: >
 +          Determines whether the system allows both IPv6 & IPv4, or disables on
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0006-dbus-interface-add-boot-option-support-for-floppy-an.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0006-dbus-interface-add-boot-option-support-for-floppy-an.patch
deleted file mode 100644
index f0d7b03f8..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0006-dbus-interface-add-boot-option-support-for-floppy-an.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 643772fc7f6021fbfba3b14de0c86501ae3e7f3a Mon Sep 17 00:00:00 2001
-From: "Jia, Chunhui" <chunhui.jia@intel.com>
-Date: Fri, 13 Jul 2018 15:22:05 +0800
-Subject: [PATCH] [dbus interface]add boot option support for floppy and USB
-
-Current implementations use ExternalMedia type to specify both CD/DVD/USB
-/Floppy. But in IPMI spec, they are different. CD/DVD type is 0x5 and
-USB/Floppy type is 0xF.
-
-This causes a bug that we can not force BIOS boots into USB/Floppy.
-
-Test:
-$ ipmitool -H 10.239.56.91 -P 0penBmc -I lanplus raw
-   0x0 0x8 0x5 0x80 0x14 0x00 0x00 0x00
-$ ipmitool -H 10.239.56.91 -P 0penBmc -I lanplus chassis bootparam get 5
-Boot parameter version: 1
-Boot parameter 5 is valid/unlocked
-Boot parameter data: 8014000000
- Boot Flags :
-   - Boot Flag Valid
-   - Options apply to only next boot
-   - BIOS PC Compatible (legacy) boot
-   - Boot Device Selector : Force Boot from CD/DVD
-   - Console Redirection control : System Default
-   - BIOS verbosity : Console redirection occurs per BIOS
-                      configuration setting (default)
-   - BIOS Mux Control Override :
-             BIOS uses recommended setting of the mux at the end of POST
-
-$ipmitool -H 10.239.56.91 -P 0penBmc -I lanplus raw
-    0x0 0x8 0x5 0x80 0x3c 0x00 0x00 0x00
-$ipmitool -H 10.239.56.91 -P 0penBmc -I lanplus chassis bootparam get 5
-Boot parameter version: 1
-Boot parameter 5 is valid/unlocked
-Boot parameter data: 803c000000
- Boot Flags :
-   - Boot Flag Valid
-   - Options apply to only next boot
-   - BIOS PC Compatible (legacy) boot
-   - Boot Device Selector : Force Boot from Floppy/primary removable media
-   - Console Redirection control : System Default
-   - BIOS verbosity :
-     Console redirection occurs per BIOS configuration setting (default)
-
-   - BIOS Mux Control Override :
-     BIOS uses recommended setting of the mux at the end of POST
-
-Signed-off-by: Jia, Chunhui <chunhui.jia@intel.com>
----
- xyz/openbmc_project/Control/Boot/Source.interface.yaml | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/xyz/openbmc_project/Control/Boot/Source.interface.yaml b/xyz/openbmc_project/Control/Boot/Source.interface.yaml
-index ea811bd..8e5916f 100644
---- a/xyz/openbmc_project/Control/Boot/Source.interface.yaml
-+++ b/xyz/openbmc_project/Control/Boot/Source.interface.yaml
-@@ -15,12 +15,15 @@ enumerations:
-         - name: Disk
-           description: >
-             Boot from the local hard disk.
--        - name: ExternalMedia
-+        - name: DVD
-           description: >
--            Boot from CD/DVD/USB, etc.
-+            Boot from CD/DVD.
-         - name: Network
-           description: >
-             Boot from a remote source over a network.
-         - name: Default
-           description: >
-             Boot from an implementation defined source.
-+        - name: Removable
-+          description: >
-+            Boot from floppy/primary removable media(USB).
--- 
-2.16.2
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0017-Add-shutdown-policy-interface-for-get-set-shutdown-p.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0017-Add-shutdown-policy-interface-for-get-set-shutdown-p.patch
deleted file mode 100644
index 587bcebf1..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0017-Add-shutdown-policy-interface-for-get-set-shutdown-p.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7ebb72a93922a0163a5b35c277f3bbd241bdf78c Mon Sep 17 00:00:00 2001
-From: Yong Li <yong.b.li@linux.intel.com>
-Date: Mon, 22 Oct 2018 16:20:36 +0800
-Subject: [PATCH] Add shutdown policy interface for get/set shutdown policy OEM
- IPMI commands
-
-The policy property is used to store the shutdown policy.
-
-Tested by:
-busctl get-property  "xyz.openbmc_project.Settings" \
-"/xyz/openbmc_project/control/shutdown_policy_config" \
-"xyz.openbmc_project.Control.ShutdownPolicy" "Policy"
-
-busctl set-property  "xyz.openbmc_project.Settings" \
-"/xyz/openbmc_project/control/shutdown_policy_config" \
-"xyz.openbmc_project.Control.ShutdownPolicy" "Policy" y 1
-
-Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
----
- xyz/openbmc_project/Control/ShutdownPolicy.interface.yaml | 10 ++++++++++
- 1 file changed, 10 insertions(+)
- create mode 100644 xyz/openbmc_project/Control/ShutdownPolicy.interface.yaml
-
-diff --git a/xyz/openbmc_project/Control/ShutdownPolicy.interface.yaml b/xyz/openbmc_project/Control/ShutdownPolicy.interface.yaml
-new file mode 100644
-index 0000000..e562ea8
---- /dev/null
-+++ b/xyz/openbmc_project/Control/ShutdownPolicy.interface.yaml
-@@ -0,0 +1,10 @@
-+description: >
-+    An interface for node shutdown policy on multi-node products.
-+properties:
-+    - name: Policy
-+      type: byte
-+      description: >
-+          0: Do not shutdown node on a power supply over current(OC)
-+          or a power supply over temperature(OT) event.
-+          1: Shutdown node on an OC/OT event.
-+          Only available on multi-node products.
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch
deleted file mode 100644
index 9fe383fda..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2e265e85777345a318084c2f1f3b684f7e7ff4a4 Mon Sep 17 00:00:00 2001
-From: Cheng C Yang <cheng.c.yang@intel.com>
-Date: Thu, 28 Mar 2019 18:06:54 +0800
-Subject: [PATCH] Change some properties name in SOL Dbus
-
-Change some properties name in SOL D-Bus interface to make the meaning
-of the properties more clearly.
-
-Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com>
----
- xyz/openbmc_project/Ipmi/SOL.interface.yaml | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/xyz/openbmc_project/Ipmi/SOL.interface.yaml b/xyz/openbmc_project/Ipmi/SOL.interface.yaml
-index 94db59f..96c8c87 100644
---- a/xyz/openbmc_project/Ipmi/SOL.interface.yaml
-+++ b/xyz/openbmc_project/Ipmi/SOL.interface.yaml
-@@ -2,8 +2,8 @@ description: >
-     SOL properties use for Get/Set SOL config parameter command in host-ipmid
-     sending config to SOL process in net-ipmid.
-     Since some platforms need to access Get/Set SOL config parameter command
--    through KCS, and current sol manager is implemented in net-ipmid and
--    cannot be accessed by host-ipmid, add a dbus interface for host-ipmid
-+    through KCS, and current SOL manager is implemented in net-ipmid and
-+    cannot be accessed by host-ipmid, add a D-Bus interface for host-ipmid
-     command to transfer properties to net-ipmid.
-     This interface will be implemented in phosphor-settings.
- properties:
-@@ -17,12 +17,20 @@ properties:
-       description: >
-         SOL Enable property, this controls whether the SOL payload type
-         can be activated.
--    - name: Authentication
-+    - name: ForceEncryption
-+      type: boolean
-+      description: >
-+        If SOL enable Force Payload Encryption.
-+    - name: ForceAuthentication
-+      type: boolean
-+      description: >
-+        If SOL enable Force Payload Authentication
-+    - name: Privilege
-       type: byte
-       description: >
--        If SOL enable Force Payload Encryption and Authenticaton.
--        And the minimun operating privilege level SOL required.
--    - name: Accumulate
-+        Sets the minimum operating privilege level that is required to
-+        be able to activate SOL by Activate Payload command.
-+    - name: AccumulateIntervalMS
-       type: byte
-       description: >
-         Character Accumulate Interval in 5ms increments.
-@@ -31,13 +39,14 @@ properties:
-       type: byte
-       description: >
-         BMC will automatically send an SOL character data packet containing
--        this number of characters.
-+        this number of characters as soon as this number of characters
-+        (or greater) has been accepted from the baseboard serial controller.
-     - name: RetryCount
-       type: byte
-       description: >
-         Packet will be dropped if no ACK/NACK received by time retries
-         expire.
--    - name: RetryInterval
-+    - name: RetryIntervalMS
-       type: byte
-       description: >
-         Retry Interval in 10ms increments.
--- 
-2.16.2
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
index e46c06bcd..8521f6839 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
@@ -1,12 +1,11 @@
 SRC_URI =  "git://github.com/openbmc/phosphor-dbus-interfaces.git"
-SRCREV = "4623908c8c0e82d5831fca562c6f5a8430d494c8"
+SRCREV = "b8a82d92bb6e1727257d745189215b03016a39c6"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0002-Modify-Dbus-for-IPv6.patch \
             file://0003-Chassis-Power-Control-are-implemented.patch \
             file://0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch \
-            file://0006-dbus-interface-add-boot-option-support-for-floppy-an.patch \
             file://0007-ipmi-set-BIOS-id.patch \
             file://0009-Add-host-restart-cause-property.patch \
             file://0010-Increase-the-default-watchdog-timeout-value.patch \
@@ -14,9 +13,7 @@ SRC_URI += "file://0002-Modify-Dbus-for-IPv6.patch \
             file://0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch \
             file://0014-Add-multiple-state-signal-for-host-start-and-stop.patch \
             file://0016-Add-DBUS-interface-of-SMBIOS-MDR-V2.patch \
-            file://0017-Add-shutdown-policy-interface-for-get-set-shutdown-p.patch \
             file://0018-Define-post-code-interfaces-for-post-code-manager.patch \
             file://0019-Creating-the-Session-interface-for-Host-and-LAN.patch \
-            file://0020-Change-some-properties-name-in-SOL-Dbus.patch \
             file://0021-Add-interface-suppot-for-provisioning-modes.patch \
             "