sparc: leon3: Move ambapp_bus_init() call to arch_cpu_init() function

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>

diff --git a/arch/sparc/cpu/leon3/ambapp.c b/arch/sparc/cpu/leon3/ambapp.c
index b8ac05faf12c50c1bbe3ed3e8d94020d3d0ed231..47769cffd70a333bc80f07b98a4ecbf36e806ec1 100644 (file)
--- a/arch/sparc/cpu/leon3/ambapp.c
+++ b/arch/sparc/cpu/leon3/ambapp.c
@@ -40,7 +40,7 @@ extern int ambapp_find_ahb(struct ambapp_bus *abus, unsigned int dev_vend,
        int index, int type, struct ambapp_find_ahb_info *result);
 
 /************ C ROUTINES USED BY U-BOOT AMBA CORE DRIVERS ************/
-struct ambapp_bus ambapp_plb;
+struct ambapp_bus ambapp_plb __section(.data);
 
 void ambapp_bus_init(
        unsigned int ioarea,

diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
index 421859e0e2c119d210dd09de15e23402324fafd0..20a6a256f044eb933d1d69fab03abcc912d66493 100644 (file)
--- a/arch/sparc/cpu/leon3/cpu_init.c
+++ b/arch/sparc/cpu/leon3/cpu_init.c
@@ -56,10 +56,6 @@ void cpu_init_f(void)
         */
 void cpu_init_f2(void)
 {
-       /* Initialize the AMBA Plug & Play bus structure, the bus
-        * structure represents the AMBA bus that the CPU is located at.
-        */
-       ambapp_bus_init(CONFIG_AMBAPP_IOAREA, CONFIG_SYS_CLK_FREQ, &ambapp_plb);
 }
 
 /* If cache snooping is available in hardware the result will be set
@@ -80,6 +76,11 @@ int arch_cpu_init(void)
 
        gd->arch.snooping_available = snoop_detect();
 
+       /* Initialize the AMBA Plug & Play bus structure, the bus
+        * structure represents the AMBA bus that the CPU is located at.
+        */
+       ambapp_bus_init(CONFIG_AMBAPP_IOAREA, CONFIG_SYS_CLK_FREQ, &ambapp_plb);
+
        return 0;
 }