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/rmc/rmc.bb | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'common/recipes-bsp/rmc/rmc.bb') diff --git a/common/recipes-bsp/rmc/rmc.bb b/common/recipes-bsp/rmc/rmc.bb index f69b41a0..8c89a99c 100644 --- a/common/recipes-bsp/rmc/rmc.bb +++ b/common/recipes-bsp/rmc/rmc.bb @@ -14,33 +14,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2" SRC_URI = "git://git.yoctoproject.org/rmc" -SRCREV = "2e38d056f86c0457f3a5ca7ef848545bbb190e47" +SRCREV = "4799cb89b543712390d863a6fc50a58881590fa2" S = "${WORKDIR}/git" -DEPENDS_class-target = "gnu-efi" - COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux*" -EXTRA_OEMAKE='RMC_CFLAGS="-Wl,--hash-style=both"' - -# from gnu-efi, we should align arch-mapping with it. -def rmc_efi_arch(d): - import re - arch = d.getVar("TARGET_ARCH", True) - if re.match("i[3456789]86", arch): - return "ia32" - return arch +TARGET_CFLAGS +="-Wl,--hash-style=both" SECURITY_CFLAGS_remove_class-target = "-fstack-protector-strong" do_compile_class-target() { oe_runmake - oe_runmake RMC_EFI_HEADER_PREFIX=${STAGING_INCDIR}/efi RMC_EFI_ARCH="${@rmc_efi_arch(d)}" -f Makefile.efi + oe_runmake -f Makefile.efi } do_install() { - oe_runmake RMC_EFI_ARCH="${@rmc_efi_arch(d)}" RMC_INSTALL_PREFIX=${D}/usr install - oe_runmake RMC_EFI_ARCH="${@rmc_efi_arch(d)}" RMC_INSTALL_PREFIX=${D}/usr -f Makefile.efi install + oe_runmake RMC_INSTALL_PREFIX=${D}/usr install + oe_runmake RMC_INSTALL_PREFIX=${D}/usr -f Makefile.efi install } do_install_class-native() { -- cgit v1.2.3-54-g00ecf