[OpenBIOS] [commit] r964 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/unix include/arch/ppc

[repository service]

Author: afaerber
Date: Sun Nov 21 14:32:37 2010
New Revision: 964
URL: http://tracker.coreboot.org/trac/openbios/changeset/964

Log:
ppc: Adjust isa_io_base for ppc64

To avoid cast warnings, use a 64-bit ISA I/O base on ppc64.

v3:
* Adjust unix target, pointed out by Blue.
  Unify ppc and sparc64, using unsigned long instead of uintptr_t.
  It is initialized from pci_arch_t, which uses unsigned long.
* Update other ppc targets, pointed out by Blue.

v2:
Initial.

Cc: Blue Swirl <blauwirbel at gmail.com>
Cc: Alexander Graf <agraf at suse.de>
Signed-off-by: Andreas Färber <andreas.faerber at web.de>

Modified:
   trunk/openbios-devel/arch/ppc/briq/init.c
   trunk/openbios-devel/arch/ppc/mol/init.c
   trunk/openbios-devel/arch/ppc/pearpc/init.c
   trunk/openbios-devel/arch/ppc/qemu/init.c
   trunk/openbios-devel/arch/unix/unix.c
   trunk/openbios-devel/include/arch/ppc/io.h

Modified: trunk/openbios-devel/arch/ppc/briq/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/briq/init.c	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/arch/ppc/briq/init.c	Sun Nov 21 14:32:37 2010	(r964)
@@ -53,7 +53,7 @@
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )

Modified: trunk/openbios-devel/arch/ppc/mol/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/mol/init.c	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/arch/ppc/mol/init.c	Sun Nov 21 14:32:37 2010	(r964)
@@ -49,7 +49,7 @@
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )

Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/pearpc/init.c	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/arch/ppc/pearpc/init.c	Sun Nov 21 14:32:37 2010	(r964)
@@ -56,7 +56,7 @@
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )

Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c	Sun Nov 21 14:32:37 2010	(r964)
@@ -152,7 +152,7 @@
         .irqs = { 21, 22, 23, 24 }
     },
 };
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )

Modified: trunk/openbios-devel/arch/unix/unix.c
==============================================================================
--- trunk/openbios-devel/arch/unix/unix.c	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/arch/unix/unix.c	Sun Nov 21 14:32:37 2010	(r964)
@@ -63,9 +63,7 @@
 static int segfault = 0;
 static int verbose = 0;
 
-#ifdef CONFIG_PPC
-uint32_t isa_io_base;
-#elif defined(CONFIG_SPARC64)
+#if defined(CONFIG_PPC) || defined(CONFIG_SPARC64)
 unsigned long isa_io_base;
 #endif
 

Modified: trunk/openbios-devel/include/arch/ppc/io.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/io.h	Sun Nov 21 11:36:35 2010	(r963)
+++ trunk/openbios-devel/include/arch/ppc/io.h	Sun Nov 21 14:32:37 2010	(r964)
@@ -14,7 +14,7 @@
 
 #ifndef BOOTSTRAP
 
-extern uint32_t isa_io_base;
+extern unsigned long isa_io_base;
 
 /*
  * The insw/outsw/insl/outsl macros don't do byte-swapping.