From 2fbf266487fab507a7bc34806ddd99476c53f37d Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 23 Jun 2020 16:30:56 -0400 Subject: meta-ibm: drop witherspoon-128 This system will no longer be supported or maintained. Drop to minimize cruft. (From meta-ibm rev: 7c17e6a1f826cdfbbb39ffa3f237025e56fab52f) Change-Id: Id954a1c91c754a1eb4eb67348c5fb01a115326ed Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- meta-ibm/conf/conf-notes.txt | 2 -- meta-ibm/conf/local.conf.sample | 1 - meta-ibm/conf/machine/witherspoon-128.conf | 14 -------------- .../dump/phosphor-debug-collector_%.bbappend | 1 - .../recipes-phosphor/logging/phosphor-logging_%.bbappend | 1 - .../packagegroups/packagegroup-obmc-apps.bbappend | 1 - 6 files changed, 20 deletions(-) delete mode 100644 meta-ibm/conf/machine/witherspoon-128.conf (limited to 'meta-ibm') diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt index 112353d6f..1716a40cd 100644 --- a/meta-ibm/conf/conf-notes.txt +++ b/meta-ibm/conf/conf-notes.txt @@ -8,5 +8,3 @@ witherspoon: DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image witherspoon-tacoma: DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image -witherspoon-128: -DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 94e76f3db..4b70cade4 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -1,6 +1,5 @@ #MACHINE ?= "mihawk" #MACHINE ?= "swift" -#MACHINE ?= "witherspoon-128" #MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" diff --git a/meta-ibm/conf/machine/witherspoon-128.conf b/meta-ibm/conf/machine/witherspoon-128.conf deleted file mode 100644 index d21b9b22b..000000000 --- a/meta-ibm/conf/machine/witherspoon-128.conf +++ /dev/null @@ -1,14 +0,0 @@ -MACHINEOVERRIDES =. "witherspoon:" -require conf/machine/witherspoon.conf - -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -MRW_XML = "witherspoon.xml" - -# 128MB flash size -FLASH_SIZE = "131072" - -# 32MB read-write filesystem -FLASH_UBI_RWFS_SIZE ?= "32768" -FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" -BMC_RW_SIZE = "0x2000000" diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 814699c76..19dcdca61 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -PACKAGECONFIG_append_witherspoon-128 = " host-dump-offload-pldm" PACKAGECONFIG_append_rainier = " host-dump-offload-pldm" PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-offload-pldm" diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5c1d740ba..ac5e0b969 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,3 +1,2 @@ -PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" PACKAGECONFIG_append_rainier = " openpower-pels" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 317656116..b569a9e0f 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -31,7 +31,6 @@ RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" RDEPENDS_${PN}-extras_append_rainier = " pldm openpower-hw-diags" -RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" -- cgit v1.2.3