From ebc92186cc9144aaacd37ca1ae94fcff60ec577a Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 6 Aug 2008 20:37:38 +0000 Subject: 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 Acked-by: Jordan Crouse 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 Acked-by: Jordan Crouse ------------------------------------------------------------------------ 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 Acked-by: Corey Osgood ------------------------------------------------------------------------ git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/mkelfImage/linux-ia64/mkelf-linux-ia64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/mkelfImage/linux-ia64/mkelf-linux-ia64.c') diff --git a/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c b/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c index 82f57be79f..cfd79869ae 100644 --- a/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c +++ b/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c @@ -81,7 +81,7 @@ static void parse_kernel(struct kernel_info *info, phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff)); phdrs = 0; for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { - if (le16_to_cpu(phdr[i].p_type) != PT_LOAD) + if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) continue; phdrs++; } -- cgit v1.2.3