diff options
Diffstat (limited to 'meta-amd')
29 files changed, 81 insertions, 22 deletions
diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf index 6603316965..f5b4fdeb49 100644 --- a/meta-amd/conf/layer.conf +++ b/meta-amd/conf/layer.conf @@ -2,9 +2,9 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ + ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "amd-layer" -BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/" +BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/meta-common/" LAYERSERIES_COMPAT_amd-layer = "nanbield scarthgap" diff --git a/meta-amd/meta-common/conf/layer.conf b/meta-amd/meta-common/conf/layer.conf new file mode 100644 index 0000000000..82f1a936ce --- /dev/null +++ b/meta-amd/meta-common/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 += "common-layer" +BBFILE_PATTERN_common-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_common-layer = "nanbield scarthgap" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 43a0be09fc..43a0be09fc 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb diff --git a/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf b/meta-amd/meta-common/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf index 8dc694362a..8dc694362a 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf +++ b/meta-amd/meta-common/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf diff --git a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf b/meta-amd/meta-common/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf index 666e66aac0..666e66aac0 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf +++ b/meta-amd/meta-common/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf diff --git a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend index 8ffa93b689..8ffa93b689 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/daytonax/ttyVUART0.conf b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger/daytonax/ttyVUART0.conf index c75186415a..c75186415a 100644 --- a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/daytonax/ttyVUART0.conf +++ b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger/daytonax/ttyVUART0.conf diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf index c75186415a..c75186415a 100644 --- a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf +++ b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend index 690ac8aa33..690ac8aa33 100644 --- a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend +++ b/meta-amd/meta-common/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index ca35bcb6a1..ca35bcb6a1 100644 --- a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-amd/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend diff --git a/meta-amd/meta-daytonax/recipes-x86/chassis/x86-power-control/power-config-host0.json b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control/daytonax/power-config-host0.json index afc8d8b5ac..afc8d8b5ac 100644 --- a/meta-amd/meta-daytonax/recipes-x86/chassis/x86-power-control/power-config-host0.json +++ b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control/daytonax/power-config-host0.json diff --git a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/power-config-host0.json b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control/ethanolx/power-config-host0.json index 0d0faf9200..0d0faf9200 100644 --- a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/power-config-host0.json +++ b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control/ethanolx/power-config-host0.json diff --git a/meta-amd/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 0000000000..b2e79a8197 --- /dev/null +++ b/meta-amd/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" + +SRC_URI:append:ethanolx = " file://power-config-host0.json" +SRC_URI:append:daytonax = " file://power-config-host0.json" + +do_install:append:ethanolx() { + install -m 0755 -d ${D}/${datadir}/${PN} + install -m 0644 -D ${WORKDIR}/power-config-host0.json \ + ${D}/${datadir}/${PN}/ +} + +do_install:append:daytonax() { + install -m 0755 -d ${D}/${datadir}/${PN} + install -m 0644 -D ${WORKDIR}/power-config-host0.json \ + ${D}/${datadir}/${PN}/ +} diff --git a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/amd-fpga.bb index 6e89a4c4dc..de6eeb910f 100644 --- a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb +++ b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/amd-fpga.bb @@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SUMMARY = "AMD FPGA Register Dump Utility" DESCRIPTION = "AMD FPGA Register Dump Utility" diff --git a/meta-amd/recipes-amd/amd-fpga/files/LICENSE b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/files/LICENSE index d86ae6717a..d86ae6717a 100644 --- a/meta-amd/recipes-amd/amd-fpga/files/LICENSE +++ b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/files/LICENSE diff --git a/meta-amd/recipes-amd/amd-fpga/files/daytonax/fpgardu.sh b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/files/fpgardu.sh index 7ac6673bd6..7ac6673bd6 100644 --- a/meta-amd/recipes-amd/amd-fpga/files/daytonax/fpgardu.sh +++ b/meta-amd/meta-daytonax/recipes-amd/amd-fpga/files/fpgardu.sh diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-amd/meta-daytonax/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service index 659ff3e1e8..659ff3e1e8 100644 --- a/meta-amd/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service +++ b/meta-amd/meta-daytonax/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/meta-daytonax/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 6e528dcb6b..6e528dcb6b 100644 --- a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-amd/meta-daytonax/recipes-phosphor/fans/phosphor-pid-control_%.bbappend diff --git a/meta-amd/meta-daytonax/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-amd/meta-daytonax/recipes-x86/chassis/x86-power-control_%.bbappend deleted file mode 100644 index 4c079c7257..0000000000 --- a/meta-amd/meta-daytonax/recipes-x86/chassis/x86-power-control_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://power-config-host0.json \ -" - -do_install:append() { - install -d ${D}/${datadir}/${PN} - install -m 0644 ${WORKDIR}/power-config-host0.json ${D}/${datadir}/${PN} -} diff --git a/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample index 2703e31eb0..31dc06dd31 100644 --- a/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample +++ b/meta-amd/meta-ethanolx/conf/templates/default/bblayers.conf.sample @@ -14,4 +14,5 @@ BBLAYERS ?= " \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-amd \ ##OEROOT##/meta-amd/meta-ethanolx \ + ##OEROOT##/meta-amd/meta-common \ " diff --git a/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/amd-fpga.bb b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/amd-fpga.bb new file mode 100644 index 0000000000..de6eeb910f --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/amd-fpga.bb @@ -0,0 +1,18 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SUMMARY = "AMD FPGA Register Dump Utility" +DESCRIPTION = "AMD FPGA Register Dump Utility" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5e24678b8d0883d9dfa9e9473069ddd2" + +RDEPENDS:${PN} = "bash" +SRCREV = "${AUTOREV}" +SRC_URI = "file://fpgardu.sh" +SRC_URI += "file://LICENSE" + +S = "${WORKDIR}" + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${S}/fpgardu.sh ${D}${bindir}/ +} diff --git a/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/LICENSE b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/LICENSE new file mode 100644 index 0000000000..d86ae6717a --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/LICENSE @@ -0,0 +1,13 @@ +Full Description: +Different components of meta-amd are under different licenses (a mix +of MIT and Apache-2.0). Please see: + +COPYING.Apache-2.0 +COPYING.MIT (MIT) + +All metadata is MIT licensed unless otherwise stated. Source code +included in tree for individual recipes is under the LICENSE stated in +the associated recipe (.bb file) unless otherwise stated. + +License information for any other files is either explicitly stated +or defaults to Apache-2.0. diff --git a/meta-amd/recipes-amd/amd-fpga/files/ethanolx/fpgardu.sh b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/fpgardu.sh index 066b852f46..066b852f46 100644 --- a/meta-amd/recipes-amd/amd-fpga/files/ethanolx/fpgardu.sh +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/fpgardu.sh diff --git a/meta-amd/recipes-amd/amd-fpga/files/ip-to-fpga.service b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/ip-to-fpga.service index 2d12c68b85..2d12c68b85 100644 --- a/meta-amd/recipes-amd/amd-fpga/files/ip-to-fpga.service +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/ip-to-fpga.service diff --git a/meta-amd/recipes-amd/amd-fpga/files/ip-to-fpga.sh b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/ip-to-fpga.sh index a4d0a98c8d..a4d0a98c8d 100644 --- a/meta-amd/recipes-amd/amd-fpga/files/ip-to-fpga.sh +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/files/ip-to-fpga.sh diff --git a/meta-amd/recipes-amd/amd-fpga/ip-to-fpga.bb b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/ip-to-fpga.bb index 2dd76c93b7..2dd76c93b7 100644 --- a/meta-amd/recipes-amd/amd-fpga/ip-to-fpga.bb +++ b/meta-amd/meta-ethanolx/recipes-amd/amd-fpga/ip-to-fpga.bb diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service new file mode 100644 index 0000000000..659ff3e1e8 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service @@ -0,0 +1,14 @@ +[Unit] +Description=Phosphor-Pid-Control Margin-based Fan Control Daemon +After=xyz.openbmc_project.EntityManager.service +After=xyz.openbmc_project.ObjectMapper.service + +[Service] +Restart=always +ExecStart={bindir}/swampd -t +RestartSec=5 +StartLimitInterval=0 +Type=simple + +[Install] +WantedBy=multi-user.target diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 0000000000..6e528dcb6b --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd + +SYSTEMD_SERVICE:${PN} = "phosphor-pid-control.service" diff --git a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend deleted file mode 100644 index cba1306def..0000000000 --- a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://power-config-host0.json \ - " - -do_install:append() { - install -d ${D}/${datadir}/${PN} - install -m 0644 ${WORKDIR}/power-config-host0.json ${D}/${datadir}/${PN} -} |