[PATCH] ppc: Use config file to enable RTAS - OpenBIOS

9 Oct 2010

RTAS had to be enabled via EXTRACFLAGS=-DUSE_RTAS.
Use the config file instead.
Signed-off-by: Andreas Färber andreas.faerber@web.de
---
 arch/ppc/briq/init.c           |    4 ++--
 arch/ppc/briq/methods.c        |    4 ++--
 arch/ppc/pearpc/init.c         |    4 ++--
 arch/ppc/pearpc/methods.c      |    4 ++--
 arch/ppc/qemu/init.c           |    4 ++--
 arch/ppc/qemu/methods.c        |    4 ++--
 config/examples/ppc_config.xml |    1 +
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/arch/ppc/briq/init.c b/arch/ppc/briq/init.c
index 14abe96..0b2b3b9 100644
--- a/arch/ppc/briq/init.c
+++ b/arch/ppc/briq/init.c
@@ -85,7 +85,7 @@ setenv( char *env, char *value )
 void
 arch_of_init( void )
 {
-#if USE_RTAS
+#if CONFIG_RTAS
    phandle_t ph;
 #endif
    int autoboot;
@@ -98,7 +98,7 @@ arch_of_init( void )
    ob_pci_init();
 #endif
-#if USE_RTAS
+#if CONFIG_RTAS
    if( !(ph=find_dev("/rtas")) )
    	printk("Warning: No /rtas node\n");
    else {
diff --git a/arch/ppc/briq/methods.c b/arch/ppc/briq/methods.c
index 9978f04..649e9ba 100644
--- a/arch/ppc/briq/methods.c
+++ b/arch/ppc/briq/methods.c
@@ -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 @@ NODE_METHODS( mmu_ciface ) = {
 void
 node_methods_init( void )
 {
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
    REGISTER_NODE( rtas );
 #endif
    REGISTER_NODE( vfd_stdout );
diff --git a/arch/ppc/pearpc/init.c b/arch/ppc/pearpc/init.c
index 55b3aae..b2c11c9 100644
--- a/arch/ppc/pearpc/init.c
+++ b/arch/ppc/pearpc/init.c
@@ -88,7 +88,7 @@ setenv( char *env, char *value )
 void
 arch_of_init( void )
 {
-#if USE_RTAS
+#if CONFIG_RTAS
    phandle_t ph;
 #endif
    int autoboot;
@@ -104,7 +104,7 @@ arch_of_init( void )
    node_methods_init();
    init_video();
-#if USE_RTAS
+#if CONFIG_RTAS
    if( !(ph=find_dev("/rtas")) )
    	printk("Warning: No /rtas node\n");
    else {
diff --git a/arch/ppc/pearpc/methods.c b/arch/ppc/pearpc/methods.c
index ae3ab44..f505b6c 100644
--- a/arch/ppc/pearpc/methods.c
+++ b/arch/ppc/pearpc/methods.c
@@ -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 @@ NODE_METHODS( mmu_ciface ) = {
 void
 node_methods_init( void )
 {
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
    REGISTER_NODE( rtas );
 #endif
    REGISTER_NODE( video_stdout );
diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index 0d0db3a..3979f5d 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -572,7 +572,7 @@ static void kvm_of_init(void)
 void
 arch_of_init( void )
 {
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
    phandle_t ph;
 #endif
    uint64_t ram_size;
@@ -730,7 +730,7 @@ arch_of_init( void )
    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 {
diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c
index cf307f9..71a364f 100644
--- a/arch/ppc/qemu/methods.c
+++ b/arch/ppc/qemu/methods.c
@@ -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 @@ void
 node_methods_init( const char *cpuname )
 {
    phandle_t chosen, ph;
-#ifdef USE_RTAS
+#ifdef CONFIG_RTAS
    REGISTER_NODE( rtas );
 #endif
    REGISTER_NODE( ciface );
diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml
index cfe57e1..5f79c21 100644
--- a/config/examples/ppc_config.xml
+++ b/config/examples/ppc_config.xml
@@ -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"/>
-- 
1.7.3



    