[Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

19 files changed, 0 insertions, 305 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-inventec/conf/layer.conf
deleted file mode 100644
index de22db1e3..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "inventec"
-BBFILE_PATTERN_inventec = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/conf/machine/include/inventec.inc b/meta-openbmc-machines/meta-openpower/meta-inventec/conf/machine/include/inventec.inc
deleted file mode 100644
index c79ddd777..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/conf/machine/include/inventec.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/openpower.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
deleted file mode 100644
index 296acc3c3..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
+++ /dev/null
@@ -1,33 +0,0 @@
-# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-LCONF_VERSION = "6"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-
-BBLAYERS ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
-  "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  ##OEROOT##/meta-openembedded/meta-oe \
-  ##OEROOT##/meta-openembedded/meta-networking \
-  ##OEROOT##/meta-openembedded/meta-perl \
-  ##OEROOT##/meta-openembedded/meta-python \
-  ##OEROOT##/meta-phosphor \
-  ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang \
-  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/conf-notes.txt
deleted file mode 100644
index 9b3c01a55..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/conf-notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Common targets are:
-     obmc-phosphor-image
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/layer.conf
deleted file mode 100644
index 64223a210..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/layer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "lanyang"
-BBFILE_PATTERN_lanyang = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/local.conf.sample
deleted file mode 100644
index a4a3343b3..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/local.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-MACHINE ??= "lanyang"
-DISTRO ?= "openbmc-openpower"
-PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
-    STOPTASKS,${TMPDIR},1G,100K \
-    STOPTASKS,${DL_DIR},1G,100K \
-    STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/machine/lanyang.conf b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/machine/lanyang.conf
deleted file mode 100644
index 4ca08b1fb..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/machine/lanyang.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
-
-UBOOT_MACHINE = "ast_g5_ncsi_config"
-
-FLASH_SIZE = "65536"
-
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "lanyang-ipmi-inventory-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "lanyang-led-manager-config-native"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/inventec.inc
-require conf/machine/include/p9.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb
deleted file mode 100644
index ff68f3926..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Lanyang AVSBus control"
-DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Lanyang"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-TMPL_OFF = "avsbus-disable@.service"
-TMPL_ON = "avsbus-enable@.service"
-INSTFMT_OFF = "avsbus-disable@{0}.service"
-INSTFMT_ON = "avsbus-enable@{0}.service"
-TGTFMT_OFF = "obmc-host-stop@{0}.target"
-TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
-FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
-FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
-
-SRC_URI += "file://lanyang_avsbus.sh"
-RDEPENDS_${PN} += "i2c-tools"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/lanyang_avsbus.sh ${D}${bindir}/lanyang_avsbus.sh
-}
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
deleted file mode 100644
index add5f224e..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Disable AVSBus on VRMs
-Wants=obmc-power-stop-pre@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env lanyang_avsbus.sh disable
-SyslogIdentifier=lanyang_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
deleted file mode 100644
index 787ec4cbf..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Enable AVSBus on VRMs
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env lanyang_avsbus.sh vdn_max
-ExecStart=/usr/bin/env lanyang_avsbus.sh enable
-SyslogIdentifier=lanyang_avsbus.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh
deleted file mode 100755
index bf58defc8..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control/lanyang_avsbus.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh -e
-# AVSBus control for PMBUS voltage regulator modules (VRMs)
-# Switches output voltage target between
-# - VOUT_COMMAND register (AVSBus disabled, default on Zaius)
-# - AVSBus target output (AVSBus enabled, voltage set by host)
-
-cpu0_i2c_bus="5"
-cpu1_i2c_bus="6"
-busses="$cpu0_i2c_bus $cpu1_i2c_bus"
-vdd_i2c_addr_page="0x60:0x01"
-vdn_i2c_addr_page="0x64:0x01"
-vcs_i2c_addr_page="0x64:0x00"
-addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page"
-
-# Usage: vrm_set_page <bus> <i2c_address> <page>
-vrm_set_page()
-{
-    i2cset -y $1 $2 0x00 $3 b
-}
-
-# Usage: vrm_avs_enable <bus> <i2c_address> <page>
-# Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: AVSBus Target Rail Voltage
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to
-# PMBus control. Switching back to AVSBus control restores this persisted
-# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is
-# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround.
-vrm_avs_enable()
-{
-    vrm_set_page "$@"
-    echo Enabling AVSBus on bus $1 VRM @$2 rail $3...
-    local vout_command=`i2cget -y $1 $2 0x21 w`
-    i2cset -y $1 $2 0x21 $vout_command w
-    i2cset -y $1 $2 0x01 0xb0 b
-}
-
-# Usage: vrm_avs_disable <bus> <i2c_address> <page>
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: VOUT_COMMAND
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-vrm_avs_disable()
-{
-    vrm_set_page "$@"
-    echo Disabling AVSBus on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x01 0x80 b
-}
-
-# Usage: vrm_vout_max_1v1 <bus> <i2c_address> <page>
-# Sets VOUT_MAX to 1.1V
-vrm_vout_max_1v1()
-{
-    vrm_set_page "$@"
-    echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3...
-    i2cset -y $1 $2 0x24 0x44c w
-}
-
-# Usage: vrm_print <bus> <i2c_address> <page>
-vrm_print()
-{
-    vrm_set_page "$@"
-    local operation=`i2cget -y $1 $2 0x01 b`
-    local vout=`i2cget -y $1 $2 0x8b w`
-    local iout=`i2cget -y $1 $2 0x8c w`
-    echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout
-}
-
-# Usage: for_each_rail <command>
-# <command> will be invoked with <bus> <i2c_address> <page>
-for_each_rail()
-{
-    for bus in $busses
-    do
-        for addr_page in $addrs_pages
-        do
-            $1 $bus `echo $addr_page | tr : " "`
-        done
-    done
-}
-
-if [ "$1" == "enable" ]
-then
-    for_each_rail vrm_avs_enable
-elif [ "$1" == "disable" ]
-then
-    for_each_rail vrm_avs_disable
-elif [ "$1" == "vdn_max" ]
-then
-    addrs_pages="$vdn_i2c_addr_page"
-    for_each_rail vrm_vout_max_1v1
-else
-    for_each_rail vrm_print
-    echo "\"$0 <enable|disable>\" to control whether VRMs use AVSBus"
-    echo "\"$0 <vdn_max>\" to set VDN rails VOUT_MAX to 1.1V"
-fi
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console/obmc-console.conf
deleted file mode 100644
index a5ba3f328..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-lpc-address = 0x3f8
-sirq = 4
-local-tty = ttyS0
-local-tty-baud = 115200
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend
deleted file mode 100644
index ab94de866..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/console/obmc-console_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend_lanyang := "${THISDIR}/${PN}:"
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend
deleted file mode 100644
index e2fe9f274..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-RDEPENDS_${PN} += 'avsbus-control'
-RDEPENDS_${PN}_remove += "p9-vcs-workaround"
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend
deleted file mode 100644
index aa57bbfe6..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb
deleted file mode 100644
index 083002ebd..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config-native.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Lanyang"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-license
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-# Overwrite the example led layout yaml file prior
-# to building the phosphor-led-manager package
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml
deleted file mode 100755
index 5eb11f173..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/leds/lanyang-led-manager-config/led.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-bmc_booted:
-    sys_boot_status:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-        Priority: 'On'
-
-power_on:
-    sys_boot_status:
-        Action: 'On'
-        DutyOn: 50
-        Period: 0
-        Priority: 'On'
-
-enclosure_fault:
-    plt_fault:
-        Action: 'On'
-
-enclosure_identify:
-    attention:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-
-lamp_test:
-    plt_fault:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    attention:
-        Action: 'On'
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend
deleted file mode 100644
index 8b6248a46..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/mboxd/mboxd.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-MBOXD_FLASH_SIZE = "64M"
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb
deleted file mode 100644
index 1798dad73..000000000
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "Lanyang board wiring"
-DESCRIPTION = "Board wiring information for the Lanyang OpenPOWER system."
-PR = "r1"
-
-inherit config-in-skeleton