meta-ibm: move all meta-witherspoon metadata

The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon.  Move everything to meta-ibm.

The meta-ibm README is re-written to more accurately reflect the scope
of the layer.

Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.

(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)

Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

1 files changed, 0 insertions, 100 deletions

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml
deleted file mode 100644
index 63303d7c0..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-manager_configuration:
-  power_on_delay: 20
-
-zone_configuration:
-
-#Air cooled zones
-- zone_conditions:
-  - name: air_cooled_chassis
-
-  zones:
-    - zone: 0
-      cooling_profiles:
-      - air
-      - all
-      full_speed: 10500
-      default_floor: 8000
-      increase_delay: 5
-      decrease_interval: 30
-      interfaces:
-          - name: xyz.openbmc_project.Control.ThermalMode
-            properties:
-                - name: Supported
-                  type: array[string]
-                  values:
-                      - value: DEFAULT
-                        description: >
-                            Default thermal control mode
-                      - value: CUSTOM
-                        description: >
-                            Custom thermal control mode for handling the use of
-                            PCI cards located behind the GPU exhaust that
-                            could overtemp where the default mode is not
-                            sufficient enough.
-                      - value: HEAVY_IO
-                        description: >
-                            Heavy IO thermal control mode for handling the use
-                            of PCI cards that produce heavy IO utilization and
-                            could overtemp.
-                      - value: MAX_BASE_FAN_FLOOR
-                        description: >
-                            Maximum base fan floor mode is for handling the
-                            use of any hardware that requires the highest
-                            amount of cooling even when the system may be idle.
-                - name: Current
-                  type: string
-                  persist: true
-                  values:
-                      - value: DEFAULT
-                        description: >
-                            Set current thermal control mode to the
-                            default which will be replaced on startup if
-                            another selected mode was persisted.
-
-#Water cooled zones
-- zone_conditions:
-  - name: water_and_air_cooled_chassis
-
-  zones:
-    - zone: 0
-      cooling_profiles:
-      - water
-      - all
-      full_speed: 10500
-      default_floor: 8000
-      increase_delay: 5
-      decrease_interval: 30
-      interfaces:
-          - name: xyz.openbmc_project.Control.ThermalMode
-            properties:
-                - name: Supported
-                  type: array[string]
-                  values:
-                      - value: DEFAULT
-                        description: >
-                            Default thermal control mode
-                      - value: CUSTOM
-                        description: >
-                            Custom thermal control mode for handling the use of
-                            PCI cards located behind the GPU exhaust that
-                            could overtemp where the default mode is not
-                            sufficient enough.
-                      - value: HEAVY_IO
-                        description: >
-                            Heavy IO thermal control mode for handling the use
-                            of PCI cards that produce heavy IO utilization and
-                            could overtemp.
-                      - value: MAX_BASE_FAN_FLOOR
-                        description: >
-                            Maximum base fan floor mode is for handling the
-                            use of any hardware that requires the highest
-                            amount of cooling even when the system may be idle.
-                - name: Current
-                  type: string
-                  persist: true
-                  values:
-                     - value: DEFAULT
-                       description: >
-                           Set current thermal control mode to the
-                           default which will be replaced on startup if
-                           another selected mode was persisted.