summaryrefslogtreecommitdiff
path: root/util/mkelfImage/linux-i386/convert.h
diff options
context:
space:
mode:
authorWard Vandewege <ward@gnu.org>2008-08-06 20:37:38 +0000
committerWard Vandewege <ward@gnu.org>2008-08-06 20:37:38 +0000
commitebc92186cc9144aaacd37ca1ae94fcff60ec577a (patch)
tree8e92e08dd0d4df91416ee6f50afbaf2921d84663 /util/mkelfImage/linux-i386/convert.h
parenta70872cfde84863637dba1fb00498dc8a61dba48 (diff)
Add the contents of buildrom's
packages/mkelfimage/mkelfimage-autoconf.patch packages/mkelfimage/mkelfImage-2.7-x86_64.patch to our svn copy of mkelfimage. Signed-off-by: Ward Vandewege <ward@gnu.org> Acked-by: Jordan Crouse <jordan.crouse@amd.com> These are the original commit messages from the buildrom svn tree: ----------------------------------------------------------------------- r61 | jcrouse | 2007-11-28 13:06:23 -0500 (Wed, 28 Nov 2007) | 9 lines [BUILDROM] Fixup mkelfimage My patch makes it so all targets use vmlinux and 2.7. Including the mkelfimage patch from Yhinghai Lu. Signed-off-by: Myles Watson <myles@pel.cs.byu.edu> Acked-by: Jordan Crouse <jordan.crouse@amd.com> ------------------------------------------------------------------------ r80 | jcrouse | 2007-12-10 13:56:40 -0500 (Mon, 10 Dec 2007) | 8 lines [BUILDROM] Fix breakage in the new mkelfimage autoconf scripts Whack the autoconf scripts in mkelfimage to allow us to pass our stack protection flags in. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Acked-by: Corey Osgood <corey.osgood@gmail.com> ------------------------------------------------------------------------ git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/mkelfImage/linux-i386/convert.h')
-rw-r--r--util/mkelfImage/linux-i386/convert.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/util/mkelfImage/linux-i386/convert.h b/util/mkelfImage/linux-i386/convert.h
index 369829f78f..de2c11ee04 100644
--- a/util/mkelfImage/linux-i386/convert.h
+++ b/util/mkelfImage/linux-i386/convert.h
@@ -3,6 +3,8 @@
#define CONVERTLOC 0x10000
#define REAL_MODE_DATA_LOC 0x20000
#define GDTLOC 0x21000
+#define GDT64LOC 0x22000
+#define PGTLOC 0x23000
#define DEFAULT_ROOT_DEV ((0x3<<8)| 0)
@@ -18,10 +20,13 @@
struct image_parameters {
uint32_t convert_magic; /* a signature to verify mkelfImage was built properly */
uint32_t gdt_size;
+ uint32_t gdt64_size;
+ uint32_t pgt_size;
uint32_t bss_size;
uint16_t ramdisk_flags;
uint16_t root_dev;
uint32_t entry;
+ uint32_t switch_64;
uint32_t initrd_start;
uint32_t initrd_size;
uint8_t cmdline[CMDLINE_MAX];