diff options
author | Jonathan Liu <net147@gmail.com> | 2014-02-02 15:58:52 +1100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 10:00:34 +0000 |
commit | ed9ccb8622b347173602be8b2126324d4fdf54d8 (patch) | |
tree | 49c653e98e4181ace9f4fdcb60bdb01f02188fb2 /meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch | |
parent | 9edbd9d872c128038fd7b56fac713256fd69c6c5 (diff) | |
download | openembedded-core-contrib-ed9ccb8622b347173602be8b2126324d4fdf54d8.tar.gz |
syslinux: fix booting memtest86+ using pxelinux regression
After syslinux was updated from 4.07 to 6.01, booting memtest86+ using
pxelinux would fail:
PXELINUX 6.01 2013-07-04 Copyright (C) 1994-2013 H. Peter Anvin et al
Loading memtest86... ok
Booting kernel failed: invalid argument
This backports the necessary upstream patches to allow memtest86+ to
boot using pxelinux again.
[YOCTO #5501]
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch')
-rw-r--r-- | meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch b/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch new file mode 100644 index 0000000000..fb03bbfe2c --- /dev/null +++ b/meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch @@ -0,0 +1,50 @@ +Upstream-Status: Backport [ba638fd9bf72b0c786c88909014136cfa641a147] +Signed-off-by: Jonathan Liu <net147@gmail.com> + +From b663fd7257481438256f8267831dc10b06363b22 Mon Sep 17 00:00:00 2001 +From: Matt Fleming <matt.fleming@intel.com> +Date: Tue, 16 Jul 2013 22:16:11 +0100 +Subject: [PATCH 1/4] movebits: Add SMT_TERMINAL - a last resort region type + +Some memory regions are usable, but only as a last resort just before we +hand over control to a kernel image. Add the necessary movebits +infrastructure to use these regions when all other options have been +exhausted. + +Signed-off-by: Matt Fleming <matt.fleming@intel.com> + +Conflicts: + com32/lib/syslinux/zonelist.c +--- + com32/include/syslinux/movebits.h | 1 + + com32/lib/syslinux/movebits.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h +index 8bcdf3e..114a896 100644 +--- a/com32/include/syslinux/movebits.h ++++ b/com32/include/syslinux/movebits.h +@@ -34,6 +34,7 @@ enum syslinux_memmap_types { + SMT_RESERVED, /* Unusable memory */ + SMT_ALLOC, /* Memory allocated by user */ + SMT_ZERO, /* Memory that should be zeroed */ ++ SMT_TERMINAL, /* Memory to be used as a last resort */ + }; + + struct syslinux_memmap { +diff --git a/com32/lib/syslinux/movebits.c b/com32/lib/syslinux/movebits.c +index 7a05f3c..8ffdc63 100644 +--- a/com32/lib/syslinux/movebits.c ++++ b/com32/lib/syslinux/movebits.c +@@ -160,7 +160,7 @@ static const struct syslinux_memmap *is_free_zone(const struct syslinux_memmap + if (list->start <= start) { + if (llast >= last) { + /* Chunk has a single, well-defined type */ +- if (list->type == SMT_FREE) { ++ if (list->type == SMT_FREE || list->type == SMT_TERMINAL) { + dprintf("F: 0x%08x bytes at 0x%08x\n", + list->next->start, list->start); + return list; /* It's free */ +-- +1.8.5.3 + |