meta-ibm: remove swift machine

This machine is no longer in use

Change-Id: Icad284c92fa1cf9c5fc5f0afacb58e287a9557e2
Signed-off-by: Andrew Geissler <[email protected]>

Author: geissonator

README.md

@@ -54,21 +54,25 @@ supported hardware targets, see the following example:
 $ . setup <machine> [build_dir]
 Target machine must be specified. Use one of:
 
-bletchley               mori                    s8036
-dl360poc                mtjade                  swift
+ahe50dc                 harma                   s7106
+bletchley               kudo                    s8036
+daytonax                lannister               sbp1
+dl360-g11               minerva                 spc621d8hm3
+dl360poc                mori                    starscream
+dl385-g11               mtjade                  system1
 e3c246d4i               mtmitchell              tatlin-archive-x86
-ethanolx                nicole                  tiogapass
-evb-ast2500             olympus-nuvoton         transformers
-evb-ast2600             on5263m5                vegman-n110
-evb-npcm750             p10bmc                  vegman-rx20
-f0b                     palmetto                vegman-sx20
-fp5280g2                qcom-dc-scm-v1          witherspoon
-g220a                   quanta-q71l             witherspoon-tacoma
-gbs                     romed8hm3               x11spi
-greatlakes              romulus                 yosemitev2
-gsj                     s2600wf                 zaius
-kudo                    s6q
-lannister               s7106
+e3c256d4i               ncplite                 tiogapass
+ethanolx                nicole                  transformers
+evb-ast2500             olympus-nuvoton         vegman-n110
+evb-ast2600             p10bmc                  vegman-rx20
+evb-npcm750             palmetto                vegman-sx20
+evb-npcm845             qcom-dc-scm-v1          witherspoon
+f0b                     quanta-q71l             witherspoon-tacoma
+fp5280g3                rl300-g11               x11spi
+g220a                   romed8hm3               yosemite4
+gbs                     romulus                 yosemitev2
+genesis3                s2600wf                 zaius
+greatlakes              s6q
 ```
 
 Once you know the target (e.g. romulus), source the `setup` script as follows:

meta-ibm/README.md

@@ -32,7 +32,7 @@ Server with up to 6 NVIDIA Tesla GPUs. More information can be found
 [here](https://www.ibm.com/us-en/marketplace/power-systems-ac922).
 
 In addition to witherspoon, this layer contains additional machine
-configurations such as swift. The default machine target is witherspoon,
+configurations such as p10bmc. The default machine target is witherspoon,
 so in order to build a different configuration, or to build witherspoon
 after building a different one, set the MACHINE environment to the desired
 configuration name (see the conf/machine/ subdirectory for available options):
@@ -45,7 +45,7 @@ Then build:
 
 Example:
 
-    export MACHINE=swift
+    export MACHINE=p10bmc
     bitbake obmc-phosphor-image
     bitbake phosphor-logging
 

meta-ibm/conf/machine/swift.conf

@@ -2,8 +2,6 @@ Example build invocations:
 
 p10bmc:
 MACHINE=p10bmc bitbake obmc-phosphor-image
-swift:
-MACHINE=swift bitbake obmc-phosphor-image
 witherspoon:
 MACHINE=witherspoon bitbake obmc-phosphor-image
 witherspoon-tacoma:

meta-ibm/conf/templates/default/conf-notes.txt

@@ -1,5 +1,4 @@
 #MACHINE ?= "p10bmc"
-#MACHINE ?= "swift"
 MACHINE ??= "witherspoon"
 DISTRO ?= "openbmc-openpower"
 PACKAGE_CLASSES ?= "package_ipk"

meta-ibm/conf/templates/default/local.conf.sample

@@ -28,11 +28,6 @@ do_install:append:witherspoon() {
         printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
-do_install:append:swift() {
-        DEST=${D}${inventory_envdir}
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory
-}
-
 do_install:append:witherspoon-tacoma() {
         DEST=${D}${inventory_envdir}
         printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory

meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend

@@ -12,25 +12,16 @@ S = "${WORKDIR}"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
 SRC_URI:append:witherspoon = " file://power-workarounds.sh"
-SRC_URI:append:swift = " file://power-workarounds.sh"
 
 do_install:append:witherspoon() {
         install -d ${D}${bindir}
         install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh
 }
 
-do_install:append:swift() {
-        install -d ${D}${bindir}
-        install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh
-}
-
 TMPL_WA = "[email protected]"
 INSTFMT_WA = "power-workarounds@{0}.service"
 TGTFMT = "obmc-chassis-poweron@{0}.target"
 FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}"
 
 SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_WA}"
 SYSTEMD_LINK:${PN}:append:witherspoon = "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
-
-SYSTEMD_SERVICE:${PN}:append:swift = " ${TMPL_WA}"
-SYSTEMD_LINK:${PN}:append:swift = "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"

meta-ibm/recipes-phosphor/chassis/power-workarounds.bb

@@ -39,7 +39,6 @@ RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-co
 RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger libmctp"
 RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller"
 RDEPENDS:${PN}-extras:append:sbp1 = " phosphor-ipmi-ipmb "
-RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm"
 
 RDEPENDS:${PN}-software:append:ibm-ac-server = " phosphor-software-manager-sync"
 RDEPENDS:${PN}-software:append:p10bmc = " phosphor-software-manager-usb"

meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh

@@ -12,7 +12,6 @@ DEPENDS:append:ibm-ac-server = " power-sequencer"
 DEPENDS:append:p10bmc = " power-sequencer"
 
 PACKAGECONFIG:append:ibm-ac-server = " monitor"
-PACKAGECONFIG:append:swift = " monitor"
 PACKAGECONFIG:append:p10bmc = " monitor-ng"
 PACKAGECONFIG:append:system1 = " monitor-ng"
 

meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/[email protected]

@@ -16,22 +16,6 @@ CHIPS:witherspoon = " \
                bus@1e78a000/i2c-bus@180/ir35221@71 \
                bus@1e78a000/i2c-bus@380/tmp275@4a \
                "
-CHIPS:swift = " \
-               bus@1e78a000/i2c-bus@100/max31785@52 \
-               bus@1e78a000/i2c-bus@100/power-supply@68 \
-               bus@1e78a000/i2c-bus@100/power-supply@69 \
-               bus@1e78a000/i2c-bus@440/tmp275@4a \
-               bus@1e78a000/i2c-bus@440/tmp275@48 \
-               bus@1e78a000/i2c-bus@300/tmp275@48 \
-               bus@1e78a000/i2c-bus@300/dps310@76 \
-               bus@1e78a000/i2c-bus@300/si7021a20@20 \
-               bus@1e78a000/i2c-bus@380/ir35219@70 \
-               bus@1e78a000/i2c-bus@380/ir35221@71 \
-               bus@1e78a000/i2c-bus@380/ir35221@72 \
-               bus@1e78a000/i2c-bus@3c0/ir35219@70 \
-               bus@1e78a000/i2c-bus@3c0/ir35221@71 \
-               bus@1e78a000/i2c-bus@3c0/ir35221@72 \
-               "
 
 CHIPS:witherspoon-tacoma = " \
                bus@1e78a000/i2c-bus@200/max31785@52 \