summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-20 23:21:33 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-03-22 15:29:39 (GMT)
commitf2502f90ab3decc5c3faf38ecfd13ac3bce4f411 (patch)
tree15d27e6e8eadf743f5a7d6f25dc44577e284160d /recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
parent90d32d53cf2d0d7b0edc5e8eab734f620fb8c3ec (diff)
downloadmeta-intel-f2502f90ab3decc5c3faf38ecfd13ac3bce4f411.tar.gz
systemd-boot/rmc-boot.inc: update to work with v237 and meson
Patch changes: * 0001-sd-boot-Link-RMC-library-into-bootloader-and-stub.patch removed because make is no longer used. * 0001-sd-boot-stub-check-LoadOptions-contains-data.patch removed because it was accepted upstream. * 0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch added to support RMC functionality. Upstream removed a snippet that found the root directory because they didn't need it anymore, but RMC does. * 0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch added to support building with meson instead of make. * Others refreshed inc file changes: * Don't commit pin, we can maintain these patches OK for now * EXTRA_OEMAKE -> EXTRA_OEMESON, and removed some superfluous options Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc')
-rw-r--r--recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc24
1 files changed, 9 insertions, 15 deletions
diff --git a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
index 11fddaf..e27d495 100644
--- a/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
+++ b/recipes-bsp/systemd-boot/systemd-boot/rmc-boot.inc
@@ -1,21 +1,15 @@
1# Pin systemd revision down for systemd-boot recipe. 1# This patchset contains hooks that allows systemd-boot to use RMC capablilities.
2# Patches could not be applied cleanly when systemd in OE is updated,
3# though we don't expect a lot of changes could happen in bootloader.
4# RMC is designed to support a large number of types of boards, so we
5# should do explicit update with validation to prevent regression even
6# resolving conflicts for a new tip could be done in a short time.
7
8# Revision: systemd v232 in OE
9SRCREV_intel-x86-common = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c"
10 2
11DEPENDS_append_intel-x86-common = " rmc rmc-efi" 3DEPENDS_append_intel-x86-common = " rmc rmc-efi"
12 4
13EXTRA_OEMAKE_append_intel-x86-common = ' EFI_LDFLAGS="-L${STAGING_DIR_HOST}/usr/lib" EFI_CFLAGS="-I${STAGING_INCDIR}/rmc -DRMC_EFI"' 5EXTRA_OEMESON_append_intel-x86-common = ' \
6 -Drmc-includedir="${STAGING_INCDIR}/rmc" \
7 '
14 8
15SRC_URI_append_intel-x86-common = " \ 9SRC_URI_append_intel-x86-common = " \
16 file://0001-sd-boot-Link-RMC-library-into-bootloader-and-stub.patch \ 10 file://0001-partially-revert-sd-boot-stub-Obtain-PE-section-offs.patch \
17 file://0002-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \ 11 file://0002-sd-boot-fix-RMC-compatibility-with-systemd-boot-and-.patch \
18 file://0003-sd-boot-Support-global-kernel-command-line-fragment.patch \ 12 file://0003-sd-boot-Load-board-specific-boot-entries-from-RMC-da.patch \
19 file://0004-sd-boot-Support-global-kernel-command-line-fragment-in-EFI-stub.patch \ 13 file://0004-sd-boot-Support-global-kernel-command-line-fragment.patch \
20 file://0001-sd-boot-stub-check-LoadOptions-contains-data.patch \ 14 file://0005-sd-boot-support-global-kernel-command-line-in-EFI-st.patch \
21 " 15 "