diff options
author | John Wang <wangzqbj@inspur.com> | 2019-05-17 03:49:38 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-05 15:58:45 +0300 |
commit | 728c9e5e5a10bbd020b30955e3260ee939c0dedf (patch) | |
tree | 239b9a95b320a58344b9f35da4e40889e1716dc6 /meta-inspur/meta-on5263m5/recipes-phosphor | |
parent | bab20941c451d79aa6bdd3cbad89edb45e7cc18c (diff) | |
download | openbmc-728c9e5e5a10bbd020b30955e3260ee939c0dedf.tar.xz |
meta-inspur: Move recipes under meta-common
Since meta-common is an x86 platform related meta,
it would cause ambiguity if other platform related
machines are created. In order to avoid ambiguity,
recipses under meta-common are moved to meta-on5263m5,
the meta-common folder is deleted.
Tested:
export TEMPLATECONF=meta-inspur/meta-on5263m5/conf
source openbmc-env
bitbake obmc-phosphor-image
Build successfully
(From meta-inspur rev: 295f5c5f6fbec43e8d5727e9a50dcba58e951cbd)
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: Iffacaf8131ec83362ec453a51818f6901f1f80e5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-inspur/meta-on5263m5/recipes-phosphor')
4 files changed, 0 insertions, 134 deletions
diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index b02709ec2..000000000 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "gpio_configs": { - - "power_config": { - "power_good_in": "PGOOD", - "power_up_outs": [ - {"name": "POWER_UP_PIN", "polarity": true} - ], - "reset_outs": [ - {"name": "RESET_OUT", "polarity": false} - ] - } - }, - - "gpio_definitions": [ - { - "name": "PGOOD", - "pin": "AB3", - "direction": "in" - }, - { - "name": "POWER_BUTTON", - "pin": "E2", - "direction": "both" - }, - { - "name": "POWER_UP_PIN", - "pin": "E3", - "direction": "out" - }, - { - "name": "RESET_BUTTON", - "pin": "E0", - "direction": "both" - }, - { - "name": "RESET_OUT", - "pin": "E1", - "direction": "out" - }, - { - "name": "ID_BUTTON", - "pin": "S6", - "direction": "both" - } - ] -} 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 |