diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-04-27 06:56:47 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-04-27 06:56:47 +0000 |
| commit | 14e22779625de673569c7b950ecc2753fb915b31 (patch) | |
| tree | 14a6ed759e116e9e6e9bbd7f499b74b96d6cc072 /util/mkelfImage/linux-ia64/mkelf-linux-ia64.c | |
| parent | 0e1e8065e303030c39c3f2c27e5d32ee58a16c66 (diff) | |
| download | coreboot-14e22779625de673569c7b950ecc2753fb915b31.tar.xz | |
Since some people disapprove of white space cleanups mixed in regular commits
while others dislike them being extra commits, let's clean them up once and
for all for the existing code. If it's ugly, let it only be ugly once :-)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/mkelfImage/linux-ia64/mkelf-linux-ia64.c')
| -rw-r--r-- | util/mkelfImage/linux-ia64/mkelf-linux-ia64.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c b/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c index cfd79869ae..d4236cac99 100644 --- a/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c +++ b/util/mkelfImage/linux-ia64/mkelf-linux-ia64.c @@ -112,8 +112,8 @@ static int populate_kernel_phdrs(struct kernel_info *info, struct memelfphdr *ph if (paddr > le64_to_cpu(info->phdr[j].p_paddr)) { continue; } - if (hdr && - le64_to_cpu(hdr->p_paddr) < + if (hdr && + le64_to_cpu(hdr->p_paddr) < le64_to_cpu(info->phdr[j].p_paddr)) { continue; } @@ -131,7 +131,7 @@ static int populate_kernel_phdrs(struct kernel_info *info, struct memelfphdr *ph } return i; } - + void linux_ia64_usage(void) { @@ -192,7 +192,7 @@ int linux_ia64_mkelf(int argc, char **argv, ehdr->ei_data = ELFDATA2LSB; ehdr->e_type = ET_EXEC; ehdr->e_machine = EM_IA_64; - + /* locate the payload buffer */ payload_buf = payload; payload_size = sizeof(payload); @@ -221,10 +221,10 @@ int linux_ia64_mkelf(int argc, char **argv, /* Fill in the program headers*/ phdr[0].p_type = PT_NOTE; - + /* Fill in the kernel program headers */ - index = 1 + populate_kernel_phdrs(&kinfo, phdr + 1); - + index = 1 + populate_kernel_phdrs(&kinfo, phdr + 1); + /* Fill in the converter program header */ phdr[index].p_paddr = roundup(phdr[index -1].p_paddr + phdr[index -1].p_memsz, 16); phdr[index].p_vaddr = phdr[index].p_paddr; |