diff options
Diffstat (limited to 'meta-hpe/meta-common')
7 files changed, 98 insertions, 23 deletions
diff --git a/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable.bb b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable.bb new file mode 100644 index 000000000..58cc921a5 --- /dev/null +++ b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable.bb @@ -0,0 +1,20 @@ +SUMMARY = "Enable Host Boot" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${HPEBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit obmc-phosphor-systemd + +HOST_BOOT_SERVICE = "host-boot-enable.service" +SYSTEMD_SERVICE:${PN} += "${HOST_BOOT_SERVICE}" + +HOST_BOOT_FMT = "../${HOST_BOOT_SERVICE}:multi-user.target.wants/${HOST_BOOT_SERVICE}" +SYSTEMD_LINK_${PN} += "${HOST_BOOT_FMT}" + +SRC_URI += "file://host-boot-enable.service" +SRC_URI += "file://host-boot-enable.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/host-boot-enable.sh ${D}${bindir} +} diff --git a/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.service b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.service new file mode 100644 index 000000000..58f8c5d25 --- /dev/null +++ b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.service @@ -0,0 +1,15 @@ +[Unit] +Description=Enable Host Boot +Wants=phosphor-ipmi-host.service +After=phosphor-ipmi-host.service + +[Service] +Type=simple +ExecStart=/bin/sh -c "host-boot-enable.sh" +SyslogIdentifier=host-boot-enable +Restart=always +RestartSec=5 +StartLimitInterval=0 + +[Install] +WantedBy=multi-user.target diff --git a/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.sh b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.sh new file mode 100644 index 000000000..1798607e0 --- /dev/null +++ b/meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +findmtd() { + m=$(grep -xl "$1" /sys/class/mtd/*/name) + m=${m%/name} + m=${m##*/} + echo $m +} + +rom_lists=(host-prime host-second vrom-prime vrom-second) +rom_mtd_list=() + +for f in "${rom_lists[@]}" +do + image=$(findmtd ${f}) + if test -z "$image" + then + echo "Unable to find mtd partition for ${f}" + exit 1 + fi + rom_mtd_list+=($image) +done + +#enable vrom +# host-prime to vrom-prime +dd if=/dev/${rom_mtd_list[0]} of=/dev/${rom_mtd_list[2]} +# host-second to vrom-second +dd if=/dev/${rom_mtd_list[1]} of=/dev/${rom_mtd_list[3]} + +echo 0x1800008a > /sys/class/soc/srom/vromoff + +val=$(( ("$(devmem 0xd1000006 8)" && 0xff) | 0x04 )) +devmem 0xd1000006 8 $val +devmem 0xd1000018 8 0xff +while [ true ] +do + devmem 0xd100000f 8 0x14 + sleep 1 +done + diff --git a/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend index 7c21fb4d2..721ad10ad 100644 --- a/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-hpe/meta-common/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -47,19 +47,19 @@ do_generate_static[depends] += " \ " -make_image_links_append() { +make_image_links:append() { ln -sf ${DEPLOY_DIR_IMAGE}/hpe-section image-section } -do_mk_static_symlinks_append() { +do_mk_static_symlinks:append() { ln -sf hpe-section image-section } -do_generate_static_prepend() { +do_generate_static:prepend() { bb.build.exec_func("do_generate_hpe_image", d) } -do_generate_static_append() { +do_generate_static:append() { _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), 'hpe-section'), int(d.getVar('FLASH_SECTION_OFFSET', True)), diff --git a/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend index cdf163cea..ab76653ff 100644 --- a/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend +++ b/meta-hpe/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend :="${THISDIR}/files:" +FILESEXTRAPATHS:prepend :="${THISDIR}/files:" SRC_URI += "file://gxp-obmc-init.sh \ " -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/gxp-obmc-init.sh ${D}/init } -FILES_${PN} += " /init /shutdown /update /whitelist /dev " -FILES_${PN} += " /init-options /init-download-url " +FILES:${PN} += " /init /shutdown /update /whitelist /dev " +FILES:${PN} += " /init-options /init-download-url " diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 82a748b91..3f16d41e7 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -16,31 +16,31 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "HPE Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "HPE Chassis" +RDEPENDS:${PN}-chassis = " \ obmc-phosphor-buttons-signals \ obmc-phosphor-buttons-handler \ obmc-op-control-power \ obmc-host-failure-reboots \ " -SUMMARY_${PN}-fans = "HPE Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "HPE Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-flash = "HPE Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "HPE Flash" +RDEPENDS:${PN}-flash = " \ obmc-control-bmc \ " -SUMMARY_${PN}-system = "HPE System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "HPE System" +RDEPENDS:${PN}-system = " \ bmcweb \ phosphor-webui \ phosphor-ipmi-ipmb \ diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index fc6a05510..101e9c1c0 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,10 +1,10 @@ -RDEPENDS_${PN}-logging += "phosphor-logging" -RDEPENDS_${PN}-extras += " bmcweb \ +RDEPENDS:${PN}-logging += "phosphor-logging" +RDEPENDS:${PN}-extras += " bmcweb \ phosphor-webui \ phosphor-image-signing \ phosphor-pid-control \ " -RDEPENDS_${PN}-fan-control = " \ +RDEPENDS:${PN}-fan-control = " \ ${VIRTUAL-RUNTIME_obmc-fan-control} \ " |