From 58e5069ee34edd585ca11dfa387bd122d45995aa Mon Sep 17 00:00:00 2001 From: Jianxun Zhang Date: Mon, 28 Nov 2016 14:00:45 -0800 Subject: rmc: integration update This is a whole package of rmc work in meta-intel to reflect some major changes in the upstream project: In rmc.bb recipe, EFI_ARCH, path of EFI header files, and dependency on gnu-efi are removed with the updated revision. In systemd-boot, patches to integrate with rmc are re-worked mainly because of new APIs. Size of patches are smaller than the previous implementation. Notice we still use multiple APIs instead of calling an one-step interface multiple times, to get some potential runtime performance benefit. (rmc tool in user space is changed to use single API in the upstream project.) Fixes [YOCTO #10086] Fixes [YOCTO #10671] Signed-off-by: Jianxun Zhang Signed-off-by: Saul Wold --- common/recipes-bsp/systemd-boot/systemd-boot.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/recipes-bsp/systemd-boot/systemd-boot.bbappend') diff --git a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend b/common/recipes-bsp/systemd-boot/systemd-boot.bbappend index ed317554..2aecc3f9 100644 --- a/common/recipes-bsp/systemd-boot/systemd-boot.bbappend +++ b/common/recipes-bsp/systemd-boot/systemd-boot.bbappend @@ -2,7 +2,7 @@ DEPENDS_append_intel-x86-common = " rmc" FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-boot:" -EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc/efi -DRMC_EFI"' +EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc -DRMC_EFI"' # Pin systemd revision down for systemd-boot recipe. # Patches could not be applied cleanly when systemd in OE is updated, @@ -15,7 +15,7 @@ EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/ SRCREV_intel-x86-common = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba" SRC_URI_append_intel-x86-common = " \ - file://0001-sd-boot-Link-RMC-libraries-into-bootloader.patch \ + file://0001-sd-boot-Link-RMC-library-into-bootloader.patch \ file://0002-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \ file://0003-sd-boot-Support-global-kernel-command-line-fragment.patch \ file://0001-efi-boot.c-workaround-for-Joule-BIOS-hang.patch \ -- cgit v1.2.3-54-g00ecf