From 915592415c57092cb3e8072becf4b1efd706c488 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 12 Oct 2021 20:28:34 -0500 Subject: meta-lenovo: remove unusable hr630 and hr855xg2 machines This machine is unbuildable and has not been updated in the requisite 2 months per https://lore.kernel.org/openbmc/YRUW7cazmCjW8VpP@heinlein/, so it is being deleted. Signed-off-by: Patrick Williams Change-Id: I280dea863b89a22c9ca96f888c0a2b0d209e2093 --- meta-lenovo/meta-hr630/conf/bblayers.conf.sample | 24 ---------------- meta-lenovo/meta-hr630/conf/conf-notes.txt | 5 ---- .../meta-hr630/conf/distro/openbmc-hr630.conf | 7 ----- meta-lenovo/meta-hr630/conf/layer.conf | 14 --------- meta-lenovo/meta-hr630/conf/local.conf.sample | 23 --------------- meta-lenovo/meta-hr630/conf/machine/hr630.conf | 25 ---------------- .../recipes-kernel/linux/linux-aspeed/hr630.cfg | 16 ----------- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 5 ---- .../leds/hr630-led-manager-config-native.bb | 21 -------------- .../leds/hr630-led-manager-config/led.yaml | 14 --------- .../network/phosphor-network_%.bbappend | 4 --- .../ahb/apb/bus@1e78a000/i2c-bus@40/tmp75@4e.conf | 8 ------ .../ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4d.conf | 8 ------ .../ahb/apb/pwm-tacho-controller@1e786000.conf | 33 ---------------------- .../phosphor-hwmon/obmc/hwmon/iio-hwmon.conf | 25 ---------------- .../sensors/phosphor-hwmon_%.bbappend | 18 ------------ .../skeleton/obmc-libobmc-intf/gpio_defs.json | 25 ---------------- .../skeleton/obmc-libobmc-intf_%.bbappend | 4 --- 18 files changed, 279 deletions(-) delete mode 100644 meta-lenovo/meta-hr630/conf/bblayers.conf.sample delete mode 100644 meta-lenovo/meta-hr630/conf/conf-notes.txt delete mode 100644 meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf delete mode 100644 meta-lenovo/meta-hr630/conf/layer.conf delete mode 100644 meta-lenovo/meta-hr630/conf/local.conf.sample delete mode 100644 meta-lenovo/meta-hr630/conf/machine/hr630.conf delete mode 100644 meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed/hr630.cfg delete mode 100644 meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed_%.bbappend delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config-native.bb delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config/led.yaml delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/network/phosphor-network_%.bbappend delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/tmp75@4e.conf delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4d.conf delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json delete mode 100644 meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend (limited to 'meta-lenovo/meta-hr630') diff --git a/meta-lenovo/meta-hr630/conf/bblayers.conf.sample b/meta-lenovo/meta-hr630/conf/bblayers.conf.sample deleted file mode 100644 index 0443211c5..000000000 --- a/meta-lenovo/meta-hr630/conf/bblayers.conf.sample +++ /dev/null @@ -1,24 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-lenovo \ - ##OEROOT##/meta-lenovo/meta-hr630 \ -" diff --git a/meta-lenovo/meta-hr630/conf/conf-notes.txt b/meta-lenovo/meta-hr630/conf/conf-notes.txt deleted file mode 100644 index c0087e2a7..000000000 --- a/meta-lenovo/meta-hr630/conf/conf-notes.txt +++ /dev/null @@ -1,5 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -Common targets are: - obmc-phosphor-image diff --git a/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf b/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf deleted file mode 100644 index ea25cdd48..000000000 --- a/meta-lenovo/meta-hr630/conf/distro/openbmc-hr630.conf +++ /dev/null @@ -1,7 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -require conf/distro/openbmc-phosphor.conf - -DISTRO_NAME = "Lenovo Hr630 OpenBMC" -DISTRO_VERSION = "0.1.2" diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf deleted file mode 100644 index 2c6117c74..000000000 --- a/meta-lenovo/meta-hr630/conf/layer.conf +++ /dev/null @@ -1,14 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -# 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 += "hr630-layer" -BBFILE_PATTERN_hr630-layer = "" -BBFILE_PRIORITY_hr630-layer = "5" -LAYERSERIES_COMPAT_hr630-layer = "hardknott" diff --git a/meta-lenovo/meta-hr630/conf/local.conf.sample b/meta-lenovo/meta-hr630/conf/local.conf.sample deleted file mode 100644 index 4b5eff3c5..000000000 --- a/meta-lenovo/meta-hr630/conf/local.conf.sample +++ /dev/null @@ -1,23 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." -MACHINE ??= "hr630" -DISTRO ?= "openbmc-hr630" -PACKAGE_CLASSES ?= "package_ipk" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats 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-lenovo/meta-hr630/conf/machine/hr630.conf b/meta-lenovo/meta-hr630/conf/machine/hr630.conf deleted file mode 100644 index 04080de3d..000000000 --- a/meta-lenovo/meta-hr630/conf/machine/hr630.conf +++ /dev/null @@ -1,25 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-lenovo-${MACHINE}.dtb" - -UBOOT_MACHINE = "ast_g5_phy_config" - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/lenovo.inc - -FLASH_SIZE = "32768" - -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "hr630-led-manager-config-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "hr630-ipmi-sensor-inventory-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "hr630-ipmi-fru-read-inventory-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "hr630-ipmi-inventory-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "hr630-ipmi-fru-properties-native" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-lenovo-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-lenovo-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-lenovo-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-lenovo-apps" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" diff --git a/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed/hr630.cfg b/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed/hr630.cfg deleted file mode 100644 index 7f8d07b5e..000000000 --- a/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed/hr630.cfg +++ /dev/null @@ -1,16 +0,0 @@ -//"Copyright (c) 2019-present Lenovo -//Licensed under GPL v2, see COPYING file for details." - -CONFIG_I2C_MUX=y -CONFIG_I2C_MUX_PCA9541=y -CONFIG_I2C_MUX_PCA954x=y -CONFIG_SENSORS_ASPEED=y -CONFIG_SENSORS_TMP421=y -CONFIG_ASPEED_ADC=y -CONFIG_SENSORS_IIO_HWMON=y -CONFIG_I2C_SLAVE=y -CONFIG_PMBUS=y -CONFIG_SPI=y -CONFIG_SENSORS_MAX31790=y -CONFIG_EEPROM_AT24=y -CONFIG_DEVMEM=y diff --git a/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index d4d8b818a..000000000 --- a/meta-lenovo/meta-hr630/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -FILESEXTRAPATHS_prepend_hr630 := "${THISDIR}/${PN}:" -SRC_URI_append_hr630 = " file://hr630.cfg" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config-native.bb b/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config-native.bb deleted file mode 100644 index e3efa3d6d..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -#"Copyright (c) 2019-present Lenovo" - -SUMMARY = "Phosphor LED Group Management for hr630" -PR = "r1" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${LENOVOBASE}/COPYING.BSD;md5=efc72ac5d37ea632ccf0001f56126210" - -inherit native -inherit obmc-phosphor-utils - -PROVIDES += "virtual/phosphor-led-manager-config-native" - -SRC_URI += "file://led.yaml" -S = "${WORKDIR}" - -# Copies example led layout yaml file -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config/led.yaml b/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config/led.yaml deleted file mode 100644 index b8b9ff620..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/leds/hr630-led-manager-config/led.yaml +++ /dev/null @@ -1,14 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -bmc_booted: - heartbeat: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - -enclosure_fault: - fault: - Action: 'On' - DutyOn: 50 - Period: 0 diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/network/phosphor-network_%.bbappend deleted file mode 100644 index 7d3b0eddf..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/network/phosphor-network_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." -PACKAGECONFIG_remove_hr630 = "default-link-local-autoconf" -PACKAGECONFIG_remove_hr630 = "default-ipv6-accept-ra" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/tmp75@4e.conf b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/tmp75@4e.conf deleted file mode 100644 index ef316c193..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/tmp75@4e.conf +++ /dev/null @@ -1,8 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -LABEL_temp1 = "inlet" -WARNHI_temp1 = "60000" -WARNLO_temp1 = "0" -CRITHI_temp1 = "70000" -CRITLO_temp1 = "0" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4d.conf b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4d.conf deleted file mode 100644 index 98ed39b49..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4d.conf +++ /dev/null @@ -1,8 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -LABEL_temp1 = "outlet" -WARNHI_temp1 = "60000" -WARNLO_temp1 = "0" -CRITHI_temp1 = "70000" -CRITLO_temp1 = "0" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index d91006d54..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,33 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -# hr630x has 14 fan ports -LABEL_fan1 = "fan1" -LABEL_fan2 = "fan2" -LABEL_fan3 = "fan3" -LABEL_fan4 = "fan4" -LABEL_fan5 = "fan5" -LABEL_fan6 = "fan6" -LABEL_fan7 = "fan7" -LABEL_fan8 = "fan8" -LABEL_fan9 = "fan9" -LABEL_fan10 = "fan10" -LABEL_fan11 = "fan11" -LABEL_fan12 = "fan12" -LABEL_fan13 = "fan13" -LABEL_fan14 = "fan14" - -PWM_TARGET_fan1 = "1" -PWM_TARGET_fan2 = "1" -PWM_TARGET_fan3 = "2" -PWM_TARGET_fan4 = "2" -PWM_TARGET_fan5 = "3" -PWM_TARGET_fan6 = "3" -PWM_TARGET_fan7 = "4" -PWM_TARGET_fan8 = "4" -PWM_TARGET_fan9 = "5" -PWM_TARGET_fan10 = "5" -PWM_TARGET_fan11 = "6" -PWM_TARGET_fan12 = "6" -PWM_TARGET_fan13 = "7" -PWM_TARGET_fan14 = "7" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf deleted file mode 100644 index 299d23698..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf +++ /dev/null @@ -1,25 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -LABEL_in1=P12V_AUX -GAIN_in1=8.90 -LABEL_in2=P5V_AUX -GAIN_in2=3.68 -LABEL_in3=P3V3_AUX -GAIN_in3=2.47 -LABEL_in4=P1V8_PCH_AUX -GAIN_in4=1.50 -LABEL_in5=PVNN_PCH_AUX -LABEL_in6=P1V05_PCH_AUX -LABEL_in7=P1V2_DDR_BMC -LABEL_in8=P1V15_BMC -LABEL_in9=PVCCIO_CPU2 -LABEL_in10=PVCCIO_CPU1 -LABEL_in11=P12V_STBY -GAIN_in11=8.90 -LABEL_in12=P12V -GAIN_in12=8.90 -LABEL_in13=P5V -GAIN_in13=3.68 -LABEL_in14=P3V3 -GAIN_in14=2.47 diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend deleted file mode 100644 index 4098609cb..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -FILESEXTRAPATHS_prepend_hr630 := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_hr630 = " -Dnegative-errno-on-fail=true" - -CHIPS = " \ - bus@1e78a000/i2c-bus@40/tmp75@4e \ - bus@1e78a000/i2c-bus@80/tmp75@4d \ - pwm-tacho-controller@1e786000 \ - " -ITEMSFMT = "ahb/apb/{0}.conf" - -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -ITEMS += "iio-hwmon.conf" - -ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index d0441a69b..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "gpio_configs": { - - "power_config": { - "power_good_in": "PGOOD", - "power_up_outs": [ - ], - "reset_outs": [ - ] - } - }, - - "gpio_definitions": [ - { - "name": "PGOOD", - "pin": "Z1", - "direction": "in" - }, - { - "name": "POWER_UP_PIN", - "pin": "I0", - "direction": "both" - } - ] -} diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend deleted file mode 100644 index 5bb2557a2..000000000 --- a/meta-lenovo/meta-hr630/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -#"Copyright (c) 2019-present Lenovo -#Licensed under BSD-3, see COPYING.BSD file for details." - -FILESEXTRAPATHS_prepend_hr630 := "${THISDIR}/${PN}:" -- cgit v1.2.3