[OpenBIOS] [commit] r909 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/pearpc arch/ppc/qemu config/examples
repository service
svn at openbios.org
Sat Oct 16 19:36:23 CEST 2010
Author: blueswirl
Date: Sat Oct 16 19:36:22 2010
New Revision: 909
URL: http://tracker.coreboot.org/trac/openbios/changeset/909
Log:
ppc: Use config file to enable RTAS
RTAS had to be enabled via EXTRACFLAGS=-DUSE_RTAS.
Use the config file instead.
Signed-off-by: Andreas Färber <andreas.faerber at web.de>
Signed-off-by: Blue Swirl <blauwirbel at gmail.com>
Modified:
trunk/openbios-devel/arch/ppc/briq/init.c
trunk/openbios-devel/arch/ppc/briq/methods.c
trunk/openbios-devel/arch/ppc/pearpc/init.c
trunk/openbios-devel/arch/ppc/pearpc/methods.c
trunk/openbios-devel/arch/ppc/qemu/init.c
trunk/openbios-devel/arch/ppc/qemu/methods.c
trunk/openbios-devel/config/examples/ppc_config.xml
Modified: trunk/openbios-devel/arch/ppc/briq/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/briq/init.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/briq/init.c Sat Oct 16 19:36:22 2010 (r909)
@@ -85,7 +85,7 @@
void
arch_of_init( void )
{
-#if USE_RTAS
+#if CONFIG_RTAS
phandle_t ph;
#endif
int autoboot;
@@ -98,7 +98,7 @@
ob_pci_init();
#endif
-#if USE_RTAS
+#if CONFIG_RTAS
if( !(ph=find_dev("/rtas")) )
printk("Warning: No /rtas node\n");
else {
Modified: trunk/openbios-devel/arch/ppc/briq/methods.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/briq/methods.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/briq/methods.c Sat Oct 16 19:36:22 2010 (r909)
@@ -28,7 +28,7 @@
/* RTAS (run-time abstraction services) */
/************************************************************************/
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" );
/* ( physbase -- rtas_callback ) */
@@ -321,7 +321,7 @@
void
node_methods_init( void )
{
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
REGISTER_NODE( rtas );
#endif
REGISTER_NODE( vfd_stdout );
Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/pearpc/init.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sat Oct 16 19:36:22 2010 (r909)
@@ -88,7 +88,7 @@
void
arch_of_init( void )
{
-#if USE_RTAS
+#if CONFIG_RTAS
phandle_t ph;
#endif
int autoboot;
@@ -104,7 +104,7 @@
node_methods_init();
init_video();
-#if USE_RTAS
+#if CONFIG_RTAS
if( !(ph=find_dev("/rtas")) )
printk("Warning: No /rtas node\n");
else {
Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sat Oct 16 19:36:22 2010 (r909)
@@ -28,7 +28,7 @@
/* RTAS (run-time abstraction services) */
/************************************************************************/
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" );
/* ( physbase -- rtas_callback ) */
@@ -317,7 +317,7 @@
void
node_methods_init( void )
{
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
REGISTER_NODE( rtas );
#endif
REGISTER_NODE( video_stdout );
Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 16 19:36:22 2010 (r909)
@@ -582,7 +582,7 @@
void
arch_of_init( void )
{
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
phandle_t ph;
#endif
uint64_t ram_size;
@@ -740,7 +740,7 @@
ofmem_register(find_dev("/memory"), find_dev(buf));
node_methods_init(buf);
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
if( !(ph=find_dev("/rtas")) )
printk("Warning: No /rtas node\n");
else {
Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/methods.c Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sat Oct 16 19:36:22 2010 (r909)
@@ -30,7 +30,7 @@
/* RTAS (run-time abstraction services) */
/************************************************************************/
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" );
/* ( physbase -- rtas_callback ) */
@@ -303,7 +303,7 @@
node_methods_init( const char *cpuname )
{
phandle_t chosen, ph;
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
REGISTER_NODE( rtas );
#endif
REGISTER_NODE( ciface );
Modified: trunk/openbios-devel/config/examples/ppc_config.xml
==============================================================================
--- trunk/openbios-devel/config/examples/ppc_config.xml Sat Oct 16 19:36:18 2010 (r908)
+++ trunk/openbios-devel/config/examples/ppc_config.xml Sat Oct 16 19:36:22 2010 (r909)
@@ -58,6 +58,7 @@
<!-- Miscellaneous -->
<option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>
+ <option name="CONFIG_RTAS" type="boolean" value="false"/>
<!-- Drivers -->
<option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>
More information about the OpenBIOS
mailing list