From: Simon Horman <horms@verge.net.au>
To: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org
Cc: Maxim Uvarov <muvarov@gmail.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Subject: [patch] ppc: Fix gamecube build
Date: Fri, 14 May 2010 00:25:19 +0900 [thread overview]
Message-ID: <20100513152519.GA4143@verge.net.au> (raw)
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 <sebastian@breakpoint.cc>
Cc: Maxim Uvarov <muvarov@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
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
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
From: Simon Horman <horms@verge.net.au>
To: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org
Cc: Maxim Uvarov <muvarov@gmail.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Subject: [patch] ppc: Fix gamecube build
Date: Fri, 14 May 2010 00:25:19 +0900 [thread overview]
Message-ID: <20100513152519.GA4143@verge.net.au> (raw)
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 <sebastian@breakpoint.cc>
Cc: Maxim Uvarov <muvarov@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
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
next reply other threads:[~2010-05-13 15:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 15:25 Simon Horman [this message]
2010-05-13 15:25 ` [patch] ppc: Fix gamecube build Simon Horman
2010-05-19 0:22 ` Simon Horman
2010-05-19 0:22 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100513152519.GA4143@verge.net.au \
--to=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=muvarov@gmail.com \
--cc=sebastian@breakpoint.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.