From 14e22779625de673569c7b950ecc2753fb915b31 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 27 Apr 2010 06:56:47 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/mkelfImage/linux-ia64/convert_params.c | 18 ++++++++-------- util/mkelfImage/linux-ia64/head.S | 30 +++++++++++++-------------- util/mkelfImage/linux-ia64/mkelf-linux-ia64.c | 14 ++++++------- 3 files changed, 31 insertions(+), 31 deletions(-) (limited to 'util/mkelfImage/linux-ia64') diff --git a/util/mkelfImage/linux-ia64/convert_params.c b/util/mkelfImage/linux-ia64/convert_params.c index 5022e52c4c..a58f4adf80 100644 --- a/util/mkelfImage/linux-ia64/convert_params.c +++ b/util/mkelfImage/linux-ia64/convert_params.c @@ -58,7 +58,7 @@ static void printf(const char *fmt, ...) continue; } if (*++fmt == 's') { - for(p = va_arg(args, char *); *p != '\0'; p++) + for(p = va_arg(args, char *); *p != '\0'; p++) putchar(*p); } else { /* Length of item is bounded */ @@ -76,7 +76,7 @@ static void printf(const char *fmt, ...) fmt++; } } - + /* * Before each format q points to tmp buffer * After each format q points past end of item @@ -150,7 +150,7 @@ int memcmp(void *vs1, void *vs2, size_t size) return *s1 - *s2; } return 0; - + } void strappend(char *dest, const char *src, size_t max) @@ -229,7 +229,7 @@ static void convert_bhdr_params(Elf_Bhdr *bhdr) { unsigned char *note, *end; char *ldr_name, *ldr_version, *firmware; - + ldr_name = ldr_version = firmware = 0; note = ((char *)bhdr) + sizeof(*bhdr); @@ -241,10 +241,10 @@ static void convert_bhdr_params(Elf_Bhdr *bhdr) n_name = note + sizeof(*hdr); n_desc = n_name + ((hdr->n_namesz + 3) & ~3); next = n_desc + ((hdr->n_descsz + 3) & ~3); - if (next > end) + if (next > end) break; #if 0 - printf("n_type: %x n_name(%d): n_desc(%d): \n", + printf("n_type: %x n_name(%d): n_desc(%d): \n", hdr->n_type, hdr->n_namesz, hdr->n_descsz); #endif @@ -302,7 +302,7 @@ static void convert_bhdr_params(Elf_Bhdr *bhdr) note = next; } if (ldr_name && ldr_version) { - printf("Loader: %s version: %s\n", + printf("Loader: %s version: %s\n", ldr_name, ldr_version); } if (firmware) { @@ -311,12 +311,12 @@ static void convert_bhdr_params(Elf_Bhdr *bhdr) } } -void *convert_params(unsigned long arg1, unsigned long r28, +void *convert_params(unsigned long arg1, unsigned long r28, struct image_parameters *params) { struct ia64_boot_param *orig_bp; Elf_Bhdr *bhdr = (Elf_Bhdr*)arg1; - + /* handle the options I can easily deal with */ bp.command_line = (unsigned long)¶ms->cmdline; bp.initrd_start = params->initrd_start; diff --git a/util/mkelfImage/linux-ia64/head.S b/util/mkelfImage/linux-ia64/head.S index 4a12fb5566..df1b6827cb 100644 --- a/util/mkelfImage/linux-ia64/head.S +++ b/util/mkelfImage/linux-ia64/head.S @@ -1,5 +1,5 @@ #define ASSEMBLY 1 - + .text #include "convert.h" @@ -13,13 +13,13 @@ _start: movl r15=@gprel(_start) ;; sub gp=r14,r15 /* gp = _start - @gprel(_start), current value of gp */ - ;; + ;; mov out0=in0 mov out1=r28 add out2=@gprel(params),gp br.call.sptk.few rp=convert_params - + mov r28=r8 add r15=@gprel(entry), gp ;; @@ -50,7 +50,7 @@ _start: #define UART_FCR 0x02 #define UART_LCR 0x03 #define UART_MCR 0x04 - + #define UART_DLL 0x00 #define UART_DLM 0x01 /* Status */ @@ -75,38 +75,38 @@ uart_init: /* set the UART_BASE */ movl r31=UART_PHYS_BASE ;; - + /* disable interrupts */ add r30=UART_IER,r31 mov r29=0x00 - ;; + ;; st1 [r30]=r29 /* enable fifos */ add r30=UART_FCR,r31 mov r29=0x01 - ;; + ;; st1 [r30]=r29 /* Set Baud Rate Divisor to UART_BAUD */ add r30=UART_LCR,r31 mov r29=0x83 - ;; + ;; st1 [r30]=r29 add r30=UART_DLL,r31 mov r29=UART_DIV_LO - ;; + ;; st1 [r30]=r29 - + add r30=UART_DLM,r31 mov r29=UART_DIV_HI - ;; + ;; st1 [r30]=r29 add r30=UART_LCR,r31 mov r29=0x03 - ;; + ;; st1 [r30]=r29 br.ret.sptk.few rp @@ -133,7 +133,7 @@ __uart_tx_byte: ;; st1.rel.nta [r30]=r32 ;; - + /* Wait until the UART is empty to be certain the byte is flushed */ add r30=UART_LSR,r31 ;; @@ -153,7 +153,7 @@ __uart_tx_hex_char: (p63) add r32=48,r32 /* digits*/ (p62) add r32=55,r32 /* letters */ br.cond.sptk.few __uart_tx_byte - + uart_tx_hex64: /* set the UART_bASE */ movl r31=UART_PHYS_BASE @@ -212,7 +212,7 @@ uart_tx_hex64: ;; mov ar.pfs = r26 mov rp = r27 - ;; + ;; br.ret.sptk.few rp #endif 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; -- cgit v1.2.3