From: Mohan Kumar M <mohan@in.ibm.com>
Date: Fri, 12 Dec 2008 03:31:38 +0000 (+0000)
Subject: Allow yaboot to load relocatable kernel
X-Git-Tag: yaboot-1.3.15-rc~4
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=6a77b7a8418741a270bc8c74406b935168c587dc

Allow yaboot to load relocatable kernel

PPC64 relocatable kernels (built with CONFIG_RELOCATABLE=y) have the type of
ET_DYN. But yaboot code won't load the kernel if the ELF type is not
ET_EXEC. Attached patch adds support to yaboot to load relocatable kernels
also (ie load ET_DYN type also)

Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---

diff --git a/second/yaboot.c b/second/yaboot.c
index d6e8017..3db7b4f 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
 	     e->e_ident[EI_MAG3]  == ELFMAG3	    &&
 	     e->e_ident[EI_CLASS] == ELFCLASS64  &&
 	     e->e_ident[EI_DATA]  == ELFDATA2MSB &&
-	     e->e_type            == ET_EXEC	    &&
+	     (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
 	     e->e_machine         == EM_PPC64);
 }