From d8154d0392fc3675ab902b9ac5b6f419da71c2dd Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Wed, 24 Feb 2021 20:46:10 +0300 Subject: phosphor-settings-manager: add 'boot_type' option Add 'boot_type' package configuration parameter that is used to add support for the Legacy/EFI boot override selector for systems with x86 host. This setting is designed for selection between - "PC compatible" boot (legacy) - Extensible Firmware Interface Boot (EFI) In the presence of a 'boot_type' parameter the default value for the BootType dbus interface is set to EFI boot. Signed-off-by: Konstantin Aladyshev Change-Id: I2d75960f0a3350aa4d464179d4ee7a1758e09d72 --- .../boot_type.override.yml | 32 ++++++++++++++++++++++ .../settings/phosphor-settings-manager_git.bb | 5 ++++ 2 files changed, 37 insertions(+) create mode 100644 meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml (limited to 'meta-phosphor/recipes-phosphor/settings') diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml new file mode 100644 index 000000000..da1501302 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml @@ -0,0 +1,32 @@ +/xyz/openbmc_project/control/host0/boot: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular + - Interface: xyz.openbmc_project.Control.Boot.Type + Properties: + BootType: + Default: Type::Types::EFI + +/xyz/openbmc_project/control/host0/boot/one_time: + - Interface: xyz.openbmc_project.Control.Boot.Source + Properties: + BootSource: + Default: Source::Sources::Default + - Interface: xyz.openbmc_project.Control.Boot.Mode + Properties: + BootMode: + Default: Mode::Modes::Regular + - Interface: xyz.openbmc_project.Control.Boot.Type + Properties: + BootType: + Default: Type::Types::EFI + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'true' + diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index a0773a3a9..1ea501a6d 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -27,6 +27,11 @@ DEPENDS += "libcereal" S = "${WORKDIR}/git" SRC_URI += "file://merge_settings.py" +# 'boot_type' configuration parameter is used to add support for +# the Legacy/EFI boot override selector for systems with x86 host +PACKAGECONFIG[boot_type] = "" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'boot_type', 'file://boot_type.override.yml', '', d)}" + EXTRA_OECONF = " \ SETTINGS_YAML=${STAGING_DIR_NATIVE}${settings_datadir}/defaults.yaml \ " -- cgit v1.2.3