From patchwork Thu May 13 15:25:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 52488 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 2049BB7FD6 for ; Fri, 14 May 2010 01:25:46 +1000 (EST) Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) by ozlabs.org (Postfix) with ESMTP id 648F2B7E2B for ; Fri, 14 May 2010 01:25:26 +1000 (EST) Received: from harry.kent.sydney.vergenet.net (EM114-48-73-230.pool.e-mobile.ne.jp [114.48.73.230]) by kirsty.vergenet.net (Postfix) with ESMTP id 1F6CE245A7; Fri, 14 May 2010 01:25:24 +1000 (EST) Received: by harry.kent.sydney.vergenet.net (Postfix, from userid 7100) id 923ED4742D2; Fri, 14 May 2010 00:25:19 +0900 (JST) Date: Fri, 14 May 2010 00:25:19 +0900 From: Simon Horman To: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org Subject: [patch] ppc: Fix gamecube build Message-ID: <20100513152519.GA4143@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Maxim Uvarov , Sebastian Andrzej Siewior X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This fixes the kexec-build on ppc32 when the --game-cube option is supplied to ./configure. It seems to have bit-rotted a little. Cc: Sebastian Andrzej Siewior Cc: Maxim Uvarov Signed-off-by: Simon Horman Index: kexec-tools/kexec/arch/ppc/kexec-elf-ppc.c =================================================================== --- kexec-tools.orig/kexec/arch/ppc/kexec-elf-ppc.c 2010-05-14 00:18:25.000000000 +0900 +++ kexec-tools/kexec/arch/ppc/kexec-elf-ppc.c 2010-05-14 00:20:58.000000000 +0900 @@ -162,17 +162,9 @@ int elf_ppc_load(int argc, char **argv, unsigned long max_addr, hole_addr; struct mem_phdr *phdr; size_t size; - unsigned long long *rsvmap_ptr; - struct bootblock *bb_ptr; - unsigned int nr_segments; - unsigned long my_kernel, my_dt_offset; - unsigned long my_stack, my_backup_start; #ifdef CONFIG_PPC64 unsigned long toc_addr; #endif - unsigned int slave_code[256 / sizeof(unsigned int)], master_entry; - unsigned char *seg_buf = NULL; - off_t seg_size = 0; #ifdef WITH_GAMECUBE int target_is_gamecube = 1; char *arg_buf; @@ -183,13 +175,21 @@ int elf_ppc_load(int argc, char **argv, unsigned char *setup_start; uint32_t setup_size; #else + unsigned long long *rsvmap_ptr; + struct bootblock *bb_ptr; + unsigned int nr_segments; + unsigned long my_kernel, my_dt_offset; + unsigned long my_stack, my_backup_start; + unsigned int slave_code[256 / sizeof(unsigned int)], master_entry; + unsigned char *seg_buf = NULL; + off_t seg_size = 0; int target_is_gamecube = 0; unsigned int addr; unsigned long dtb_addr; +#endif #define FIXUP_ENTRYS (20) char *fixup_nodes[FIXUP_ENTRYS + 1]; int cur_fixup = 0; -#endif int opt; command_line = NULL; Index: kexec-tools/kexec/arch/ppc/kexec-ppc.c =================================================================== --- kexec-tools.orig/kexec/arch/ppc/kexec-ppc.c 2010-05-14 00:18:25.000000000 +0900 +++ kexec-tools/kexec/arch/ppc/kexec-ppc.c 2010-05-14 00:20:58.000000000 +0900 @@ -26,6 +26,11 @@ #include "config.h" +uint64_t rmo_top; +unsigned long long crash_base, crash_size; +unsigned int rtas_base, rtas_size; +int max_memory_ranges; + #ifdef WITH_GAMECUBE #define MAX_MEMORY_RANGES 64 static struct memory_range memory_range[MAX_MEMORY_RANGES]; @@ -46,15 +51,11 @@ static int get_memory_ranges_gc(struct m } #else static int use_new_dtb; -int max_memory_ranges; static int nr_memory_ranges, nr_exclude_ranges; static struct memory_range *exclude_range; static struct memory_range *memory_range; static struct memory_range *base_memory_range; static uint64_t memory_max; -uint64_t rmo_top; -unsigned long long crash_base, crash_size; -unsigned int rtas_base, rtas_size; /* * Count the memory nodes under /proc/device-tree and populate the