diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-phosphor/recipes-phosphor/settings | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/settings')
-rw-r--r-- | meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml | 32 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb | 5 |
2 files changed, 37 insertions, 0 deletions
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 \ " |