diff options
Diffstat (limited to 'meta-inspur')
32 files changed, 336 insertions, 140 deletions
diff --git a/meta-inspur/MAINTAINERS b/meta-inspur/MAINTAINERS new file mode 100644 index 000000000..af86b18f7 --- /dev/null +++ b/meta-inspur/MAINTAINERS @@ -0,0 +1,47 @@ +How to use this list: + Find the most specific section entry (described below) that matches where + your change lives and add the reviewers (R) and maintainers (M) as + reviewers. You can use the same method to track down who knows a particular + code base best. + + Your change/query may span multiple entries; that is okay. + + If you do not find an entry that describes your request at all, someone + forgot to update this list; please at least file an issue or send an email + to a maintainer, but preferably you should just update this document. + +Description of section entries: + + Section entries are structured according to the following scheme: + + X: NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!> + X: ... + . + . + . + + Where REPO_NAME is the name of the repository within the OpenBMC GitHub + organization; FILE_PATH is a file path within the repository, possibly with + wildcards; X is a tag of one of the following types: + + M: Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>; + if omitted from an entry, assume one of the maintainers from the + MAINTAINERS entry. + R: Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>; + these people are to be added as reviewers for a change matching the repo + path. + F: Denotes forked from an external repository; has fields URL. + + Line comments are to be denoted "# SOME COMMENT" (typical shell style + comment); it is important to follow the correct syntax and semantics as we + may want to use automated tools with this file in the future. + + A change cannot be added to an OpenBMC repository without a MAINTAINER's + approval; thus, a MAINTAINER should always be listed as a reviewer. + +START OF MAINTAINERS LIST +------------------------- + +M: John Wang <wangzqbj@inspur.com> <JohnWang!> +R: George Liu <liuxiwei@inspur.com> <liuxiwei!> +R: Lei Yu <mine260309@gmail.com> <LeiYU!> diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 16f6f2a7b..3ba10679e 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -2,13 +2,11 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ - ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "inspur-layer" -BBFILE_PATTERN_inspur-layer = "" -LAYERVERSION_inspur-layer = "1" +BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" LAYERSERIES_COMPAT_inspur-layer = "thud warrior" INSPURBASE = '${@os.path.normpath("${LAYERDIR}/")}' - diff --git a/meta-inspur/conf/machine/include/inspur.inc b/meta-inspur/conf/machine/include/inspur.inc deleted file mode 100644 index d90a01ad2..000000000 --- a/meta-inspur/conf/machine/include/inspur.inc +++ /dev/null @@ -1,21 +0,0 @@ -OBMC_MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-ctl \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " - -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" - -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" -#PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor" diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample new file mode 100644 index 000000000..85de97268 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample @@ -0,0 +1,31 @@ +# 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-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-inspur \ + ##OEROOT##/meta-inspur/meta-fp5280g2\ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-inspur \ + ##OEROOT##/meta-inspur/meta-fp5280g2 \ + " diff --git a/meta-inspur/meta-fp5280g2/conf/conf-notes.txt b/meta-inspur/meta-fp5280g2/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf new file mode 100644 index 000000000..2570a9a19 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf @@ -0,0 +1 @@ +require conf/distro/openbmc-openpower.conf diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf new file mode 100644 index 000000000..56da4ba91 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -0,0 +1,10 @@ +# 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 += "fp5280g2-layer" +BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_fp5280g2-layer = "thud warrior" diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample new file mode 100644 index 000000000..189fcb3d2 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample @@ -0,0 +1,17 @@ +MACHINE ??= "fp5280g2" +DISTRO ?= "openbmc-fp5280g2" +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-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf new file mode 100644 index 000000000..2e754bc1f --- /dev/null +++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf @@ -0,0 +1,11 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/openpower.inc +require conf/machine/include/p9.inc diff --git a/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed/fp5280g2/fp5280g2.cfg b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed/fp5280g2/fp5280g2.cfg new file mode 100644 index 000000000..587dc57d1 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed/fp5280g2/fp5280g2.cfg @@ -0,0 +1,4 @@ +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_EMC1403=y +CONFIG_RTC_DRV_DS3232=y +CONFIG_GPIO_PCA953X=y diff --git a/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..4d2288fe4 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_fp5280g2 = " file://fp5280g2.cfg" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/host/p9-host-start.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/p9-host-start.bbappend new file mode 100644 index 000000000..a2c59c5f8 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/p9-host-start.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}_remove_fp5280g2 = "p9-vcs-workaround" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend new file mode 100644 index 000000000..a19860e12 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -0,0 +1 @@ +OBMC_IMAGE_EXTRA_INSTALL_append_fp5280g2 = " mboxd liberation-fonts uart-render-controller" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend new file mode 100644 index 000000000..b6a7b0ca3 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -0,0 +1 @@ +MBOXD_FLASH_SIZE_fp5280g2 = "64M" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@0/tmp112@4a.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@0/tmp112@4a.conf new file mode 100644 index 000000000..3f0260bfe --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@0/tmp112@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "psu_inlet" +WARNHI_temp1 = "63000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "65000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@1/tmp112@4a.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@1/tmp112@4a.conf new file mode 100644 index 000000000..7390e7747 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@1/tmp112@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "ocp_zone" +WARNHI_temp1 = "63000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "65000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@2/tmp112@4a.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@2/tmp112@4a.conf new file mode 100644 index 000000000..642b3d83d --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@2/tmp112@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "bmc_zone" +WARNHI_temp1 = "120000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@48.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@48.conf new file mode 100644 index 000000000..4189ab342 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@48.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "inlet" +WARNHI_temp1 = "40000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "42000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@49.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@49.conf new file mode 100644 index 000000000..615a1cbc3 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp112@49.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "outlet" +WARNHI_temp1 = "68000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..8835411fb --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" +LABEL_fan2 = "fan0_1" +LABEL_fan3 = "fan1_0" +LABEL_fan4 = "fan1_1" +LABEL_fan5 = "fan2_0" +LABEL_fan6 = "fan2_1" +LABEL_fan7 = "fan3_0" +LABEL_fan8 = "fan3_1" + +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" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf new file mode 100644 index 000000000..0ef4a957b --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf @@ -0,0 +1,9 @@ +LABEL_in1=p3v_bat +GAIN_in1=3.00 +MINVALUE_in1=2300 +MAXVALUE_in1=5500 +# The battery read is controlled by S5 +GPIOCHIP_in1=0 +GPIO_in1=149 +# Sleep in microseconds (stored into a uint64_t) +INTERVAL=86400000000 diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf new file mode 100644 index 000000000..09a32d36a --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf @@ -0,0 +1,109 @@ +LABEL_in1=P3V3 +GAIN_in1=2.47 +WARNHI_in1=3531 +WARNLO_in1=3069 +CRITHI_in1=3630 +CRITLO_in1=2970 +MINVALUE_in1=3135 +MAXVALUE_in1=3465 +LABEL_in2=P5V +GAIN_in2=4.30 +WARNHI_in2=5350 +WARNLO_in2=4650 +CRITHI_in2=5500 +CRITLO_in2=4500 +MINVALUE_in2=4750 +MAXVALUE_in2=5250 +LABEL_in3=P12V +GAIN_in3=9.22 +WARNHI_in3=12840 +WARNLO_in3=11160 +CRITHI_in3=13200 +CRITLO_in3=10800 +MINVALUE_in3=11400 +MAXVALUE_in3=12600 +LABEL_in4=PVDD_CPU0 +WARNHI_in4=1177 +WARNLO_in4=558 +CRITHI_in4=1210 +CRITLO_in4=540 +MINVALUE_in4=600 +MAXVALUE_in4=1100 +LABEL_in5=PVDD_CPU1 +WARNHI_in5=1177 +WARNLO_in5=558 +CRITHI_in5=1210 +CRITLO_in5=540 +MINVALUE_in5=600 +MAXVALUE_in5=1100 +LABEL_in6=PVCS_CPU0 +WARNHI_in6=1177 +WARNLO_in6=893 +CRITHI_in6=1210 +CRITLO_in6=864 +MINVALUE_in6=960 +MAXVALUE_in6=1100 +LABEL_in7=PVCS_CPU1 +WARNHI_in7=1177 +WARNLO_in7=893 +CRITHI_in7=1210 +CRITLO_in7=864 +MINVALUE_in7=960 +MAXVALUE_in7=1100 +LABEL_in8=PVDN_CPU0 +WARNHI_in8=1177 +WARNLO_in8=605 +CRITHI_in8=1210 +CRITLO_in8=585 +MINVALUE_in8=650 +MAXVALUE_in8=1100 +LABEL_in9=PVDN_CPU1 +WARNHI_in9=1177 +WARNLO_in9=605 +CRITHI_in9=1210 +CRITLO_in9=585 +MINVALUE_in9=650 +MAXVALUE_in9=1100 +LABEL_in10=PVIO_CPU0 +WARNHI_in10=1124 +WARNLO_in10=977 +CRITHI_in10=1155 +CRITLO_in10=945 +MINVALUE_in10=998 +MAXVALUE_in10=1103 +LABEL_in11=PVIO_CPU1 +WARNHI_in11=1124 +WARNLO_in11=977 +CRITHI_in11=1155 +CRITLO_in11=945 +MINVALUE_in11=998 +MAXVALUE_in11=1103 +LABEL_in12=PVDDQ_CPU0_CH01 +WARNHI_in12=1284 +WARNLO_in12=1116 +CRITHI_in12=1320 +CRITLO_in12=1080 +MINVALUE_in12=1140 +MAXVALUE_in12=1260 +LABEL_in13=PVDDQ_CPU0_CH67 +WARNHI_in13=1284 +WARNLO_in13=1116 +CRITHI_in13=1320 +CRITLO_in13=1080 +MINVALUE_in13=1140 +MAXVALUE_in13=1260 +LABEL_in14=PVDDQ_CPU1_CH01 +WARNHI_in14=1284 +WARNLO_in14=1116 +CRITHI_in14=1320 +CRITLO_in14=1080 +MINVALUE_in14=1140 +MAXVALUE_in14=1260 +LABEL_in15=PVDDQ_CPU1_CH67 +WARNHI_in15=1284 +WARNLO_in15=1116 +CRITHI_in15=1320 +CRITLO_in15=1080 +MINVALUE_in15=1140 +MAXVALUE_in15=1260 + diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..a2aeb2c6c --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EXTRA_OECONF_append_fp5280g2= " --enable-negative-errno-on-fail" + +CHIPS = " \ + bus@1e78a000/i2c-bus@c0/tmp112@48 \ + bus@1e78a000/i2c-bus@c0/tmp112@49 \ + bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@0/tmp112@4a \ + bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@1/tmp112@4a \ + bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@2/tmp112@4a \ + pwm-tacho-controller@1e786000 \ + " +ITEMSFMT = "ahb/apb/{0}.conf" + +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" +ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index b02709ec2..0809fe6d3 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -2,45 +2,40 @@ "gpio_configs": { "power_config": { - "power_good_in": "PGOOD", + "power_good_in": "CPLD_BMC_SYS_PWROK", "power_up_outs": [ - {"name": "POWER_UP_PIN", "polarity": true} + { "name": "BMC_CPLD_SOFTWARE_PG_N", "polarity": false}, + { "name": "BMC_CPLD_SYS_PWRON", "polarity": false} ], "reset_outs": [ - {"name": "RESET_OUT", "polarity": false} ] } }, "gpio_definitions": [ { - "name": "PGOOD", - "pin": "AB3", - "direction": "in" - }, - { - "name": "POWER_BUTTON", - "pin": "E2", - "direction": "both" + "name": "BMC_CPLD_SOFTWARE_PG_N", + "pin": "J3", + "direction": "out" }, { - "name": "POWER_UP_PIN", - "pin": "E3", + "name": "BMC_CPLD_SYS_PWRON", + "pin": "AA7", "direction": "out" }, { - "name": "RESET_BUTTON", - "pin": "E0", - "direction": "both" + "name": "CPLD_BMC_SYS_PWROK", + "pin": "AA1", + "direction": "in" }, { - "name": "RESET_OUT", - "pin": "E1", - "direction": "out" + "name": "POWER_BUTTON", + "pin": "AA6", + "direction": "both" }, { - "name": "ID_BUTTON", - "pin": "S6", + "name": "RESET_BUTTON", + "pin": "AB0", "direction": "both" } ] diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend new file mode 100644 index 000000000..27e7cf9cf --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index 93db95c5c..b49d300bf 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -6,7 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "on5263m5-layer" -BBFILE_PATTERN_on5263m5-layer = "" -BBFILE_PRIORITY_on5263m5-layer = "5" -LAYERSERIES_COMPAT_on5263m5-layer = "sumo" - +BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_on5263m5-layer = "thud warrior" diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index ba8ce1067..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -3,10 +3,14 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/inspur.inc + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" diff --git a/meta-inspur/meta-common/recipes-inspur/inspur-uuid/inspur-uuid_git.bb b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb index 2174da950..2174da950 100644 --- a/meta-inspur/meta-common/recipes-inspur/inspur-uuid/inspur-uuid_git.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb diff --git a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 517b9eb77..517b9eb77 100644 --- a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config.bb b/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config.bb deleted file mode 100644 index 1b6e926b9..000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Inspur On5263 board wiring" -DESCRIPTION = "Board wiring information for the On5263 system." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit allarch -inherit setuptools -inherit pythonnative - -PROVIDES += "virtual/obmc-inventory-data" -RPROVIDES_${PN} += "virtual-obmc-inventory-data" - -DEPENDS += "python" - -S = "${WORKDIR}" -SRC_URI += "file://On5263m5.py" - -# the following is unnecessary. -python() { - machine = d.getVar('MACHINE', True).capitalize() + '.py' - d.setVar('_config_in_skeleton', machine) -} - -do_make_setup() { - cp ${S}/${_config_in_skeleton} \ - ${S}/obmc_system_config.py - cat <<EOF > ${S}/setup.py -from distutils.core import setup - -setup(name='${BPN}', - version='${PR}', - py_modules=['obmc_system_config'], - ) -EOF -} - -addtask make_setup after do_patch before do_configure diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config/On5263m5.py b/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config/On5263m5.py deleted file mode 100644 index ca7cb2098..000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/workbook/on5263m5-config/On5263m5.py +++ /dev/null @@ -1,48 +0,0 @@ -## System states -## state can change to next state in 2 ways: -## - a process emits a GotoSystemState signal with state name to goto -## - objects specified in EXIT_STATE_DEPEND have started -SYSTEM_STATES = [ - 'BASE_APPS', - 'BMC_STARTING', - 'BMC_READY', - 'HOST_POWERING_ON', - 'HOST_POWERED_ON', - 'HOST_BOOTING', - 'HOST_BOOTED', - 'HOST_POWERED_OFF', -] - -EXIT_STATE_DEPEND = { - 'BASE_APPS' : { - '/xyz/openbmc_poroject/sensors': 0, - }, - 'BMC_STARTING' : { - '/xyz/openbmc_project/control/chassis0': 0, - }, -} - -FRU_INSTANCES = {} - -# I believe these numbers need to match the yaml file used to create the c++ ipmi map. -# the devices have types, but I don't believe that factors in here, I think these are -# just unique IDs. -ID_LOOKUP = { - 'FRU' : {}, - # The number at the end needs to match the FRU ID. - # https://github.com/openbmc/skeleton/blob/master/pysystemmgr/system_manager.py#L143 - # The parameter for it is of type 'y' (unsigned 8-bit integer) presumably decimal? - 'FRU_STR' : {}, - 'SENSOR' : {}, - 'GPIO_PRESENT' : {} -} - -GPIO_CONFIG = {} -HWMON_CONFIG = {} -GPIO_CONFIGS = {} - -# Miscellaneous non-poll sensor with system specific properties. -# The sensor id is the same as those defined in ID_LOOKUP['SENSOR']. -MISC_SENSORS = {} - -# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 |