From df4f8775c6b6bc4db577fab2f33027483e072b26 Mon Sep 17 00:00:00 2001 From: George Hung Date: Wed, 20 Jan 2021 21:40:31 +0800 Subject: meta-quanta: gbs: fix the config json issue Since the fan hwmon sysfs path may change, if the hwmon path of config json is already replaced by fan-table-init.sh, it would never change in rw partition. Add config-sku.json to make sure the correct fan hwmon sysfs path is replaced (From meta-quanta rev: fb6723490cc9cbc8fd806cdd6d795e7feca4173b) Signed-off-by: George Hung Change-Id: Ic4ae24f3311a1ced845b60bddf247cef6b3c1e1e Signed-off-by: Andrew Geissler --- .../fans/phosphor-pid-control/config-sku.json | 364 +++++++++++++++++++++ .../fans/phosphor-pid-control/config.json | 364 --------------------- .../fans/phosphor-pid-control/fan-table-init.sh | 11 +- .../fans/phosphor-pid-control_%.bbappend | 8 +- 4 files changed, 376 insertions(+), 371 deletions(-) create mode 100644 meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json delete mode 100644 meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json (limited to 'meta-quanta') diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json new file mode 100644 index 000000000..f2997efd0 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config-sku.json @@ -0,0 +1,364 @@ +{ + "version": "R03", + "sensors": [ + { + "name": "fan0", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan0", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm1", + "min": 0, + "max": 255 + }, + { + "name": "fan1", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan1", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm2", + "min": 0, + "max": 255 + }, + { + "name": "fb_fan0", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan0", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm3", + "min": 0, + "max": 255 + }, + { + "name": "fb_fan1", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan1", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm4", + "min": 0, + "max": 255 + }, + { + "name": "fb_fan2", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan2", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm5", + "min": 0, + "max": 255 + }, + { + "name": "fleeting0", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting0", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "fleeting1", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting1", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "cputemp", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/cputemp", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "zone0_vr", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/zone0_vr", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "nvme", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/nvme", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "p12v_fan", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/p12v_fan", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + } + ], + "zones": [ + { + "id": 0, + "minThermalOutput": 0.0, + "failsafePercent": 100.0, + "pids": [ + { + "name": "fan0", + "type": "fan", + "inputs": [ + "fan0" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0056, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 15.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "fan1", + "type": "fan", + "inputs": [ + "fan1" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0056, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 15.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "cputemp", + "type": "margin", + "inputs": [ + "cputemp" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 714.0, + "integralCoeff": 9.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "zone0_vr", + "type": "margin", + "inputs": [ + "zone0_vr" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 9.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "fleeting0", + "type": "margin", + "inputs": [ + "fleeting0" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 9.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "fleeting1", + "type": "margin", + "inputs": [ + "fleeting1" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 18.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + } + ] + }, + { + "id": 1, + "minThermalOutput": 0.0, + "failsafePercent": 100.0, + "pids": [ + { + "name": "fb_fan0", + "type": "fan", + "inputs": [ + "fb_fan0" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0056, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 15.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "fb_fan1", + "type": "fan", + "inputs": [ + "fb_fan1" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0056, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 15.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "fb_fan2", + "type": "fan", + "inputs": [ + "fb_fan2" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0056, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 15.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "nvme", + "type": "margin", + "inputs": [ + "nvme" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 1250.0, + "integralCoeff": 12.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "p12v_fan", + "type": "margin", + "inputs": [ + "p12v_fan" + ], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 268.0, + "integralCoeff": 4.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 2679.0, + "integralLimit_max": 18000.0, + "outLim_min": 2679.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + } + ] + } + ] +} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json deleted file mode 100644 index d28a18216..000000000 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json +++ /dev/null @@ -1,364 +0,0 @@ -{ - "version": "R03", - "sensors" : [ - { - "name": "fan0", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan0", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm1", - "min": 0, - "max": 255 - }, - { - "name": "fan1", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fan1", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm2", - "min": 0, - "max": 255 - }, - { - "name": "fb_fan0", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan0", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm3", - "min": 0, - "max": 255 - }, - { - "name": "fb_fan1", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan1", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm4", - "min": 0, - "max": 255 - }, - { - "name": "fb_fan2", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/fb_fan2", - "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/Fan_0_To_4_Hwmon/pwm5", - "min": 0, - "max": 255 - }, - { - "name": "fleeting0", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting0", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - }, - { - "name": "fleeting1", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/fleeting1", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - }, - { - "name": "cputemp", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/cputemp", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - }, - { - "name": "zone0_vr", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/zone0_vr", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - }, - { - "name": "nvme", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/nvme", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - }, - { - "name": "p12v_fan", - "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/p12v_fan", - "writePath": "", - "min": 0, - "max": 0, - "ignoreDbusMinMax": true, - "timeout": 0 - } - ], - "zones" : [ - { - "id": 0, - "minThermalOutput": 0.0, - "failsafePercent": 100.0, - "pids": [ - { - "name": "fan0", - "type": "fan", - "inputs": [ - "fan0" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 0.1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0056, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 15.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "fan1", - "type": "fan", - "inputs": [ - "fan1" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 0.1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0056, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 15.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "cputemp", - "type": "margin", - "inputs": [ - "cputemp" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 714.0, - "integralCoeff": 9.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - }, - { - "name": "zone0_vr", - "type": "margin", - "inputs": [ - "zone0_vr" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 536.0, - "integralCoeff": 9.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - }, - { - "name": "fleeting0", - "type": "margin", - "inputs": [ - "fleeting0" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 536.0, - "integralCoeff": 9.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - }, - { - "name": "fleeting1", - "type": "margin", - "inputs": [ - "fleeting1" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 536.0, - "integralCoeff": 18.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - } - ] - }, - { - "id": 1, - "minThermalOutput": 0.0, - "failsafePercent": 100.0, - "pids": [ - { - "name": "fb_fan0", - "type": "fan", - "inputs": [ - "fb_fan0" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 0.1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0056, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 15.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "fb_fan1", - "type": "fan", - "inputs": [ - "fb_fan1" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 0.1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0056, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 15.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "fb_fan2", - "type": "fan", - "inputs": [ - "fb_fan2" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 0.1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0056, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 15.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0 - } - }, - { - "name": "nvme", - "type": "margin", - "inputs": [ - "nvme" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 1250.0, - "integralCoeff": 12.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - }, - { - "name": "p12v_fan", - "type": "margin", - "inputs": [ - "p12v_fan" - ], - "setpoint": 10.0, - "pid": { - "samplePeriod": 1.0, - "proportionalCoeff": 268.0, - "integralCoeff": 4.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2679.0, - "integralLimit_max": 18000.0, - "outLim_min": 2679.0, - "outLim_max": 18000.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0.0, - "negativeHysteresis": 0.0 - } - } - ] - } - ] -} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh index 5706a73fb..68b699e0f 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh @@ -1,5 +1,11 @@ #!/bin/bash +FAN_TABLE_SKU_FILE="/usr/share/swampd/config-sku.json" +FAN_TABLE_FILE="/usr/share/swampd/config.json" + +# determine sku +cp $FAN_TABLE_SKU_FILE $FAN_TABLE_FILE + # wait for fan dbus mapper wait /xyz/openbmc_project/sensors/fan_tach/fan0 mapper wait /xyz/openbmc_project/sensors/fan_tach/fan1 @@ -12,9 +18,8 @@ mapper wait /xyz/openbmc_project/sensors/fan_tach/fb_fan2 # generate fan table writePath Fan_0_To_4_Hwmon="$(ls -la /sys/class/hwmon |grep pwm | head -n 1| tail -n +1|cut -d '/' -f 9)" -if [[ "$Fan_0_To_4_Hwmon" != "" ]] -then - sed -i "s/Fan_0_To_4_Hwmon/$Fan_0_To_4_Hwmon/g" /usr/share/swampd/config.json +if [[ "$Fan_0_To_4_Hwmon" != "" ]]; then + sed -i "s/Fan_0_To_4_Hwmon/$Fan_0_To_4_Hwmon/g" $FAN_TABLE_FILE fi # start read margin temp wait diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index f87a49394..4f21d3bcf 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://config.json" +SRC_URI_append_gbs = " file://config-sku.json" SRC_URI_append_gbs = " file://fan-table-init.sh" SRC_URI_append_gbs = " file://fan-default-speed.sh" SRC_URI_append_gbs = " file://phosphor-pid-control.service" SRC_URI_append_gbs = " file://fan-reboot-control.service" -FILES_${PN}_append_gbs = " ${datadir}/swampd/config.json" +FILES_${PN}_append_gbs = " ${datadir}/swampd/config-sku.json" FILES_${PN}_append_gbs = " ${bindir}/fan-default-speed.sh" FILES_${PN}_append_gbs = " ${bindir}/fan-table-init.sh" @@ -20,8 +20,8 @@ do_install_append_gbs() { install -m 0755 ${WORKDIR}/fan-table-init.sh ${D}/${bindir} install -d ${D}${datadir}/swampd - install -m 0644 -D ${WORKDIR}/config.json \ - ${D}${datadir}/swampd/config.json + install -m 0644 -D ${WORKDIR}/config-sku.json \ + ${D}${datadir}/swampd/config-sku.json install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-pid-control.service \ -- cgit v1.2.3