Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

5 files changed, 0 insertions, 528 deletions

diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json
deleted file mode 100644
index 928eca25e..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json
+++ /dev/null
@@ -1,90 +0,0 @@
-[
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 15,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 14,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 13,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 12,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
-]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
deleted file mode 100644
index 65697e557..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
-]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json
deleted file mode 100644
index a5cc1bf66..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json
+++ /dev/null
@@ -1,134 +0,0 @@
-[
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0",
-               "fan4_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0",
-               "fan5_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
-]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json
deleted file mode 100644
index 620a32907..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json
+++ /dev/null
@@ -1,128 +0,0 @@
-[
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
-]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json
deleted file mode 100644
index 52262fe35..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json
+++ /dev/null
@@ -1,90 +0,0 @@
-[
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 4,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 5,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
-]