diff options
Diffstat (limited to 'meta-ibm')
10 files changed, 110 insertions, 88 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample index d3a2303fc..94e76f3db 100644 --- a/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -1,6 +1,7 @@ #MACHINE ?= "mihawk" #MACHINE ?= "swift" #MACHINE ?= "witherspoon-128" +#MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 78ffbbc82..1f8c21e73 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,5 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-rainier" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf index 2184847fd..765c0684a 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -1,5 +1,8 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-tacoma" + +IMAGE_FSTYPES += "ext4" OBMC_POWER_SUPPLY_INSTANCES = "0 1" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend new file mode 100644 index 000000000..9b66d367e --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -0,0 +1,3 @@ +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/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf index 354fbe3ff..dcab0ee98 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf @@ -1,6 +1,5 @@ OBJPATH="--path=/system/chassis" AIR="--air" WATER="" -DEVICE="--dev=/dev/input/by-path/platform-gpio-keys-event" -CODE="--event=135" - +DEVICE="" +CODE="" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh index cd44c4b6b..496ece2b2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh @@ -7,7 +7,7 @@ PROPERTY="Asserted" # Get current state object=$(busctl tree $SERVICE --list | grep identify) -led=$(cat /sys/devices/platform/leds/leds/rear-id/brightness) +led=$(cat /sys/devices/platform/leds/leds/front-id/brightness) if [ "$led" == "0" ]; then busctl set-property $SERVICE $object $INTERFACE $PROPERTY b false else diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml index 59693ce77..0a7a160fe 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml @@ -1,23 +1,23 @@ BmcBooted: - power: + power-button: Action: 'Blink' DutyOn: 50 Period: 250 Priority: 'On' PowerOn: - power: + power-button: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' EnclosureFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' EnclosureIdentify: - rear-id: + front-id: Action: 'On' DutyOn: 50 Period: 0 @@ -28,7 +28,7 @@ Fan0Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -39,7 +39,7 @@ Fan1Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -50,7 +50,7 @@ Fan2Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -61,7 +61,7 @@ Fan3Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -72,7 +72,7 @@ Fan4Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -83,35 +83,35 @@ Fan5Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' Powersupply0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' Powersupply1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' LampTest: - fault: + front-fault: Action: 'Blink' DutyOn: 50 Period: 1000 Priority: 'On' - rear-id: + front-id: Action: 'Blink' DutyOn: 50 Period: 1000 Priority: 'On' - power: + power-button: Action: 'Blink' DutyOn: 50 Period: 1000 @@ -147,367 +147,367 @@ LampTest: Period: 1000 Priority: 'Blink' core0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core2Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core3Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core4Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core5Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core6Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core7Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core8Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core9Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core10Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core11Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core12Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core13Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core14Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core15Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core16Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core17Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core18Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core19Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core20Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core21Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core22Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core23Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' cpu0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' cpu1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm2Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm3Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm4Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm5Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm6Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm7Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm8Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm9Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm10Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm11Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm12Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm13Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm14Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm15Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm16Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm17Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm18Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm19Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm20Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm21Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm22Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm23Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm24Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm25Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm26Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm27Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm28Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm29Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm30Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm31Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' motherboardFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' occFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' systemFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 090912ec1..46f8b2766 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,9 +1,24 @@ +POWER_SERVICE_PACKAGES_AC_SERVER = " \ + phosphor-power-monitor \ + phosphor-power-systemd-links-monitor \ + phosphor-power-sequencer \ + phosphor-power-systemd-links-sequencer \ + phosphor-power-utils \ + phosphor-power \ +" + +POWER_SERVICE_PACKAGES_RAINIER = " \ + ${POWER_SERVICE_PACKAGES_AC_SERVER} \ + phosphor-power-regulators \ + phosphor-power-psu-monitor \ +" + RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" -RDEPENDS_${PN}-extras_append_ibm-ac-server = " phosphor-power phosphor-power-systemd-links witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " phosphor-power phosphor-power-systemd-links phosphor-webui" +RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index 350c996d0..1caacd1e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -4,9 +4,9 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON_${PN}-sequencer += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -DEPENDS += " power-sequencer" +DEPENDS_${PN}-sequencer += " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json @@ -14,4 +14,4 @@ do_install_append(){ FILES_${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index f98ee1c70..f973d1521 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -10,7 +10,7 @@ SRCREV = "4c0e8945f072f9139d0efb04e8f955663b972a84" inherit autotools inherit pkgconfig -inherit pythonnative +inherit python3native inherit obmc-phosphor-dbus-service inherit obmc-phosphor-systemd inherit phosphor-dbus-yaml |