From 134b6d49de68990ff80b297e3cb627dc168a497e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 4 Sep 2018 16:58:54 -0400 Subject: skeleton: lanyang: fix broken gpio config path 9d47808f7e1 erroneously introduced some new files in a meta-inventec subdirectory. Move the files to the correct location. This can likely be blamed on the recent move to poky-style subtrees as 9d47808f7e1 was originally submitted to the old, pre-subtree openbmc project repository. (From meta-inventec rev: 175ad32bef1bc0664bc815020b8827cb849ad545) Change-Id: If4a2ff56bfda9d92772916314cad7dbe828fb9c7 Signed-off-by: Brad Bishop --- .../skeleton/obmc-libobmc-intf.bbappend | 1 - .../skeleton/obmc-libobmc-intf/gpio_defs.json | 78 ---------------------- .../skeleton/obmc-libobmc-intf.bbappend | 1 + .../skeleton/obmc-libobmc-intf/gpio_defs.json | 78 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend delete mode 100644 meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json create mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend create mode 100644 meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json (limited to 'meta-inventec') diff --git a/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend b/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index 0bb36c66b..000000000 --- a/meta-inventec/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "gpio_configs": { - - "power_config": { - "power_good_in": "SYS_PWROK_BUFF", - "latch_out": "BMC_UCD_LATCH_LE", - "power_up_outs": [ - {"name": "SOFTWARE_PGOOD", "polarity": true}, - {"name": "BMC_POWER_UP", "polarity": false} - ], - "reset_outs": [ - ] - } - }, - - "gpio_definitions": [ - { - "name": "SOFTWARE_PGOOD", - "pin": "M6", - "direction": "out" - }, - { - "name": "BMC_POWER_UP", - "pin": "E2", - "direction": "out" - }, - { - "name": "SYS_PWROK_BUFF", - "pin": "F6", - "direction": "in" - }, - { - "name": "PHY_RST_N", - "pin": "D6", - "direction": "out" - }, - { - "name": "HDD_PWR_EN", - "pin": "B0", - "direction": "out" - }, - { - "name": "CP0_DEVICES_RESET_N", - "pin": "AA6", - "direction": "out" - }, - { - "name": "BMC_CP0_PERST_ENABLE", - "pin": "H3", - "direction": "out" - }, - { - "name": "BMC_UCD_LATCH_LE", - "pin": "P4", - "direction": "out" - }, - { - "name": "POWER_BUTTON", - "pin": "E4", - "direction": "both" - }, - { - "name": "RESET_BUTTON", - "pin": "E3", - "direction": "both" - }, - { - "name": "PE_MEZZB_PRSNT_N", - "pin": "P6", - "direction": "in" - }, - { - "name": "CHECKSTOP", - "pin": "F3", - "direction": "falling" - } - ] -} diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend new file mode 100644 index 000000000..72d991c7e --- /dev/null +++ b/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json new file mode 100644 index 000000000..0bb36c66b --- /dev/null +++ b/meta-inventec/meta-lanyang/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -0,0 +1,78 @@ +{ + "gpio_configs": { + + "power_config": { + "power_good_in": "SYS_PWROK_BUFF", + "latch_out": "BMC_UCD_LATCH_LE", + "power_up_outs": [ + {"name": "SOFTWARE_PGOOD", "polarity": true}, + {"name": "BMC_POWER_UP", "polarity": false} + ], + "reset_outs": [ + ] + } + }, + + "gpio_definitions": [ + { + "name": "SOFTWARE_PGOOD", + "pin": "M6", + "direction": "out" + }, + { + "name": "BMC_POWER_UP", + "pin": "E2", + "direction": "out" + }, + { + "name": "SYS_PWROK_BUFF", + "pin": "F6", + "direction": "in" + }, + { + "name": "PHY_RST_N", + "pin": "D6", + "direction": "out" + }, + { + "name": "HDD_PWR_EN", + "pin": "B0", + "direction": "out" + }, + { + "name": "CP0_DEVICES_RESET_N", + "pin": "AA6", + "direction": "out" + }, + { + "name": "BMC_CP0_PERST_ENABLE", + "pin": "H3", + "direction": "out" + }, + { + "name": "BMC_UCD_LATCH_LE", + "pin": "P4", + "direction": "out" + }, + { + "name": "POWER_BUTTON", + "pin": "E4", + "direction": "both" + }, + { + "name": "RESET_BUTTON", + "pin": "E3", + "direction": "both" + }, + { + "name": "PE_MEZZB_PRSNT_N", + "pin": "P6", + "direction": "in" + }, + { + "name": "CHECKSTOP", + "pin": "F3", + "direction": "falling" + } + ] +} -- cgit v1.2.3