From aa2b3f294df9126d5b6044e7a6e1b64514974a16 Mon Sep 17 00:00:00 2001 From: Samuel Jiang Date: Fri, 18 Oct 2019 08:56:58 +0800 Subject: meta-quanta: meta-runbmc-nuvoton: rename meta-olympus-nuvoton For avoid confusing this layer only with RUNBMC module (https://www.opencompute.org/documents/ocp-runbmc-daughterboard-card- design-specification-v1-4-1-pdf) The meta-runbmc-nuvoton will rename meta-olympus-nuvoton. That means the Quanta Olympus product with RUNBMC module which based on Nuvoton SoC. The layer configuration will binding Olympus product hardware design. (From meta-quanta rev: f4a8e7ae48dc788fa7e52f024578c67f164c8620) Change-Id: I6faa1bfbb3b8f033239fea3c41e8b8ed18fc492d Signed-off-by: Samuel Jiang Signed-off-by: Brad Bishop --- .../meta-runbmc-nuvoton/conf/bblayers.conf.sample | 27 -- .../meta-runbmc-nuvoton/conf/conf-notes.txt | 2 - meta-quanta/meta-runbmc-nuvoton/conf/layer.conf | 10 - .../meta-runbmc-nuvoton/conf/local.conf.sample | 17 - .../conf/machine/runbmc-nuvoton.conf | 26 -- .../images/files/BootBlockAndHeader_RunBMC.xml | 166 --------- .../images/files/UbootHeader_RunBMC.xml | 191 ---------- .../images/npcm7xx-bingo-native_%.bbappend | 12 - .../u-boot/u-boot-fw-utils-nuvoton/fw_env.config | 24 -- .../u-boot/u-boot-fw-utils-nuvoton_%.bbappend | 7 - .../linux/linux-nuvoton/runbmc-nuvoton.cfg | 77 ---- .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 3 - .../console/files/obmc-console.conf | 1 - .../console/obmc-console_%.bbappend | 12 - .../config-runbmc-nuvoton.json | 400 --------------------- .../fans/phosphor-pid-control/fan-full-speed.sh | 3 - .../fan-reboot-control.service | 12 - .../phosphor-pid-control.service | 13 - .../fans/phosphor-pid-control_%.bbappend | 29 -- .../phosphor-ipmi-ipmb/ipmb-runbmc-channels.json | 11 - .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 11 - 21 files changed, 1054 deletions(-) delete mode 100644 meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample delete mode 100644 meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt delete mode 100644 meta-quanta/meta-runbmc-nuvoton/conf/layer.conf delete mode 100644 meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample delete mode 100644 meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json delete mode 100644 meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend (limited to 'meta-quanta/meta-runbmc-nuvoton') diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample deleted file mode 100644 index 1e6f3b030..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample +++ /dev/null @@ -1,27 +0,0 @@ -# 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-python \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-runbmc-nuvoton \ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-runbmc-nuvoton \ - " diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt b/meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf b/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf deleted file mode 100644 index ccb683fe8..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf +++ /dev/null @@ -1,10 +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 += "runbmc-nuvoton-layer" -BBFILE_PATTERN_runbmc-nuvoton-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_runbmc-nuvoton-layer = "warrior zeus" diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample b/meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample deleted file mode 100644 index 37ae2b3a8..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample +++ /dev/null @@ -1,17 +0,0 @@ -MACHINE ??= "runbmc-nuvoton" -DISTRO ?= "openbmc-phosphor" -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" diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf b/meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf deleted file mode 100644 index c8e8257ca..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf +++ /dev/null @@ -1,26 +0,0 @@ -KMACHINE = "nuvoton" -KERNEL_DEVICETREE = "${KMACHINE}-npcm750-runbmc-olympus.dtb" - -require conf/machine/include/npcm7xx.inc -require conf/machine/include/obmc-bsp-common.inc - -FLASH_SIZE = "32768" -FLASH_UBOOT_OFFSET = "0" -FLASH_KERNEL_OFFSET = "2048" -FLASH_ROFS_OFFSET = "8192" -FLASH_RWFS_OFFSET = "29696" - -UBOOT_MACHINE = "PolegRunBMC_defconfig" - -IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" -IMAGE_FSTYPES += " mtd-ubi-tar" - -OBMC_MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml deleted file mode 100644 index 58723e60e..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - 0 - 0xFF - - - - - StartTag - - 0 - 0x8 - - 0x50 0x07 0x55 0xAA 0x54 0x4F 0x4F 0x42 - - - - - DestAddr - - 0x140 - 0x4 - - 0xFFFD5E00 - - - - - CodeSize - - 0x144 - 0x4 - - Poleg_bootblock.bin - - - - - Code - - 0x200 - Poleg_bootblock.bin - - Poleg_bootblock.bin - - - - - - FIU0_DRD_CFG_Set - - 0x108 - 0x4 - - 0x030011BB - - - - - FIU_Clk_Divider - - 0x10C - 0x1 - - 4 - - - - - Version - - 0x148 - 0x4 - - 0x0201 - - - - - BOARD_VENDOR - - 0x124 - 0x4 - - 100 - - - - - BOARD_TYPE - - 0x120 - 0x4 - - 0x0A - - - - - - MC_FREQ_IN_MHZ - - 0x128 - 0x2 - - 800 - - - - CPU_FREQ_IN_MHZ - - 0x12A - 0x2 - - 800 - - - - - MC_CONFIG - - 0x12C - 0x1 - - 0x01 - - - - - HOST_IF - - 0x12D - 0x1 - - 0x00 - - - - - - My_reserved - - 0x110 - 0x4 - - 0xFF 0xFF 0xFF 0xFF - - - diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml deleted file mode 100644 index 1612a8368..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - 0 - 0xFF - - - - - StartTag - - 0 - 0x8 - - 0x55 0x42 0x4F 0x4F 0x54 0x42 0x4C 0x4B - - - - - DestAddr - - 0x140 - 0x4 - - 0x8000 - - - - - CodeSize - - 0x144 - 0x4 - - u-boot.bin - - - - - Code - - 0x200 - u-boot.bin - - u-boot.bin - - - - - - FIU0_DRD_CFG_Set - - 0x108 - 0x4 - - 0x030111BC - - - - - FIU0_Clk_Divider - - 0x10C - 0x1 - - 0 - - - - - fiu0_cs1_en - - 0x10D - 0x1 - - 0x0 - - - - - fiu0_cs2_en - - 0x10E - 0x1 - - 0x0 - - - - - fiu0_cs3_en - - 0x10F - 0x1 - - 0x0 - - - - - - FIU3_DRD_CFG_Set - - 0x110 - 0x4 - - 0x030011BB - - - - - - FIU3_DWR_CFG_Set - - 0x114 - 0x4 - - 0x0 - - - - - FIU3_Clk_Divider - - 0x118 - 0x1 - - 0x0 - - - - - fiu3_cs0_en - - 0x119 - 0x1 - - 0x0 - - - - - fiu3_cs1_en - - 0x11A - 0x1 - - 0x0 - - - - - fiu3_cs2_en - - 0x11B - 0x1 - - 0x0 - - - - - fiu3_cs3_en - - 0x11C - 0x1 - - 0x0 - - - - - Version - - 0x148 - 0x4 - - 0x0201 - - - diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend deleted file mode 100644 index 664fcb01d..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_remove = "file://BootBlockAndHeader_EB.xml" -SRC_URI_remove = "file://UbootHeader_EB.xml" -SRC_URI += " file://BootBlockAndHeader_RunBMC.xml" -SRC_URI += " file://UbootHeader_RunBMC.xml" - - -do_install_append() { - install ${WORKDIR}/BootBlockAndHeader_RunBMC.xml ${D}${bindir}/BootBlockAndHeader_EB.xml - install ${WORKDIR}/UbootHeader_RunBMC.xml ${D}${bindir}/UbootHeader_EB.xml -} - diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config deleted file mode 100644 index 0c384273f..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config +++ /dev/null @@ -1,24 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash. -# Futhermore, if the Flash sector size is ommitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# NOR example -# MTD device name Device offset Env. size Flash sector size Number of sectors -/dev/mtd2 0x0000 0x40000 0x4000 - -# MTD SPI-dataflash example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd5 0x4200 0x4200 -#/dev/mtd6 0x4200 0x4200 - -# NAND example -#/dev/mtd0 0x4000 0x4000 0x20000 2 - -# Block device example -#/dev/mmcblk0 0xc0000 0x20000 - -# VFAT example -#/boot/uboot.env 0x0000 0x4000 diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend deleted file mode 100644 index 91518decf..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://fw_env.config" - -do_install_append () { - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config -} diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg b/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg deleted file mode 100644 index d970410dd..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg +++ /dev/null @@ -1,77 +0,0 @@ -CONFIG_HWMON=y -CONFIG_SENSORS_TMP100=y -CONFIG_SENSORS_LM75=y -CONFIG_SENSORS_FAN=y -CONFIG_SENSORS_ADC128D818=y -CONFIG_SENSORS_ADM1275=y -CONFIG_SENSORS_TMP102=y -CONFIG_SENSORS_TMP421=y - -CONFIG_PMBUS=y -CONFIG_SENSORS_PMBUS=y -CONFIG_SENSORS_INA2XX=y -CONFIG_SENSORS_TPS53679=y - -CONFIG_IIO=y -CONFIG_IIO_MUX=y -CONFIG_NPCM_ADC=y -CONFIG_SENSORS_IIO_HWMON=y - -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y - -CONFIG_OVERLAY_FS=y -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_XZ=y -CONFIG_JFFS2_FS=y - -CONFIG_SPI=y -CONFIG_SPI_NPCM_FIU=y -CONFIG_MTD_M25P80=y -CONFIG_SPI_NPCM_PSPI=y - -CONFIG_NET_NCSI=y - -CONFIG_EEPROM_AT24=y -CONFIG_I2C_MUX=y -CONFIG_I2C_MUX_PCA954x=y -CONFIG_I2C_SLAVE_EEPROM=y -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_PCF857X=y -CONFIG_MUX_MMIO=y -CONFIG_USB_U_ETHER=y -CONFIG_USB_F_ECM=y -CONFIG_USB_F_EEM=y -CONFIG_USB_F_SUBSET=y -CONFIG_USB_F_RNDIS=y -CONFIG_USB_F_MASS_STORAGE=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_HID=y - -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_NUVOTON=y -CONFIG_NPCM750_VCD=y -CONFIG_NPCM750_ECE=y -CONFIG_FORCE_MAX_ZONEORDER=12 - -CONFIG_USB_GADGET_NPCM_USB2=y - -CONFIG_PECI=y -CONFIG_PECI_NPCM=y -CONFIG_MFD_INTEL_PECI_CLIENT=y -CONFIG_SENSORS_PECI_CPUTEMP=y -CONFIG_SENSORS_PECI_DIMMTEMP=y -CONFIG_RESET_NPCM=y - -CONFIG_I2C_SLAVE_MQUEUE=y -CONFIG_NUVOTON_JTAG=y diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend deleted file mode 100644 index de375ce24..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:" - -SRC_URI += "file://runbmc-nuvoton.cfg" diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf deleted file mode 100644 index f99eaff47..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf +++ /dev/null @@ -1 +0,0 @@ -baud = 57600 diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend deleted file mode 100644 index 5967ce1bb..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Nuvoton OpenBMC console daemon" -DESCRIPTION = "Nuvoton Daemon to handle UART console connections" -HOMEPAGE = "http://github.com/openbmc/obmc-console" -PR = "r1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -OBMC_CONSOLE_HOST_TTY := "ttyS2" - -do_build_append() { - install -m 0644 ${THISDIR}/files/${PN}.conf ${WORKDIR}/${PN}.conf -} diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json deleted file mode 100644 index 5a78db6ee..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json +++ /dev/null @@ -1,400 +0,0 @@ -{ - "sensors" : [ - { - "name": "fan1", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan1", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1", - "min": 0, - "max": 255 - }, - { - "name": "Core_0_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_0_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_0_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_0_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_1_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_1_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_1_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_1_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_2_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_2_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_2_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_2_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_3_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_3_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_3_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_3_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_4_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_4_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_4_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_4_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_5_CPU0", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_5_CPU0", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - }, - { - "name": "Core_5_CPU1", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/Core_5_CPU1", - "writePath": "", - "min": 0, - "max": 0, - "timeout": 0 - } - ], - "zones" : [ - { - "id": 0, - "minThermalOutput": 0.0, - "failsafePercent": 100.0, - "pids": [ - { - "name": "fan1", - "type": "fan", - "inputs": ["fan1"], - "setpoint": 40.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 1.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 3.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "Core_0_CPU0", - "type": "temp", - "inputs": ["Core_0_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_0_CPU1", - "type": "temp", - "inputs": ["Core_0_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_1_CPU0", - "type": "temp", - "inputs": ["Core_1_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_1_CPU1", - "type": "temp", - "inputs": ["Core_1_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_2_CPU0", - "type": "temp", - "inputs": ["Core_2_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_2_CPU1", - "type": "temp", - "inputs": ["Core_2_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_3_CPU0", - "type": "temp", - "inputs": ["Core_3_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_3_CPU1", - "type": "temp", - "inputs": ["Core_3_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_4_CPU0", - "type": "temp", - "inputs": ["Core_4_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_4_CPU1", - "type": "temp", - "inputs": ["Core_4_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_5_CPU0", - "type": "temp", - "inputs": ["Core_5_CPU0"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - }, - { - "name": "Core_5_CPU1", - "type": "temp", - "inputs": ["Core_5_CPU1"], - "setpoint": 30.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": -20.0, - "integralCoeff": -0.1, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 16000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 1.0, - "negativeHysteresis": 1.0 - } - } - ] - } - ] -} diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh deleted file mode 100644 index 9a0d8e2e7..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!bin/bash - -echo 255 > /sys/class/hwmon/*/pwm1 diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service deleted file mode 100644 index 3ce2e01b0..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Set Fan to Full Speed as Rebooting -DefaultDependencies=no -After=shutdown.target - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/bin/fan-full-speed.sh - -[Install] -WantedBy=shutdown.target diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service deleted file mode 100644 index 57ae69c56..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=OpenBMC Fan Control Daemon - -[Service] -Type=simple -ExecStart=/usr/bin/swampd -Restart=always -RestartSec=5 -StartLimitInterval=0 -ExecStopPost=/usr/bin/fan-full-speed.sh - -[Install] -WantedBy=basic.target diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend deleted file mode 100644 index 5d7e0f977..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ /dev/null @@ -1,29 +0,0 @@ -FILESEXTRAPATHS_prepend_runbmc-nuvoton := "${THISDIR}/${PN}:" - -SRC_URI_append_runbmc-nuvoton = " file://config-runbmc-nuvoton.json" -SRC_URI_append_runbmc-nuvoton = " file://fan-full-speed.sh" -SRC_URI_append_runbmc-nuvoton = " file://phosphor-pid-control.service" -SRC_URI_append_runbmc-nuvoton = " file://fan-reboot-control.service" - -FILES_${PN}_append_runbmc-nuvoton = " ${bindir}/fan-full-speed.sh" -FILES_${PN}_append_runbmc-nuvoton = " ${datadir}/swampd/config.json" - -RDEPENDS_${PN} += "bash" - -SYSTEMD_SERVICE_${PN}_append_runbmc-nuvoton = " phosphor-pid-control.service" -SYSTEMD_SERVICE_${PN}_append_runbmc-nuvoton = " fan-reboot-control.service" - -do_install_append_runbmc-nuvoton() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/fan-full-speed.sh ${D}/${bindir} - - install -d ${D}${datadir}/swampd - install -m 0644 -D ${WORKDIR}/config-runbmc-nuvoton.json \ - ${D}${datadir}/swampd/config.json - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/phosphor-pid-control.service \ - ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/fan-reboot-control.service \ - ${D}${systemd_unitdir}/system -} diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json deleted file mode 100644 index 45100bd1d..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "channels": [ - { - "type": "me", - "master-path": "/dev/i2c-5", - "slave-path": "/sys/bus/i2c/devices/5-1010/slave-mqueue", - "bmc-addr": 32, - "remote-addr": 44 - } - ] -} diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend deleted file mode 100644 index ef0838e10..000000000 --- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend_runbmc-nuvoton := "${THISDIR}/${PN}:" - -SRC_URI_append_runbmc-nuvoton = " file://ipmb-runbmc-channels.json" -FILES_${PN}_append_runbmc-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json" - -do_install_append_runbmc-nuvoton() { - install -d ${D}${datadir}/ipmbbridge - install -m 0644 -D ${WORKDIR}/ipmb-runbmc-channels.json \ - ${D}${datadir}/ipmbbridge/ipmb-channels.json -} - -- cgit v1.2.3