ppc64: Call the PowerMac G5 init routines

parent 7e7df501
......@@ -40,6 +40,7 @@
#include <asm/time.h>
#include <asm/cputable.h>
#include <asm/sections.h>
#include <asm/btext.h>
#include <asm/nvram.h>
extern unsigned long klimit;
......@@ -55,10 +56,17 @@ extern void chrp_init(unsigned long r3,
unsigned long r6,
unsigned long r7);
extern void pmac_init(unsigned long r3,
unsigned long r4,
unsigned long r5,
unsigned long r6,
unsigned long r7);
extern void iSeries_init( void );
extern void iSeries_init_early( void );
extern void pSeries_init_early( void );
extern void pSeriesLP_init_early(void);
extern void pmac_init_early(void);
extern void mm_init_ppc64( void );
extern void pseries_secondary_smp_init(unsigned long);
extern int idle_setup(void);
......@@ -189,8 +197,24 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
#endif
parse_bootinfo();
break;
#endif /* CONFIG_PPC_PSERIES */
#ifdef CONFIG_PPC_PMAC
case PLATFORM_POWERMAC:
pmac_init_early();
#ifdef CONFIG_BLK_DEV_INITRD
initrd_start = initrd_end = 0;
#endif
parse_bootinfo();
#endif /* CONFIG_PPC_PMAC */
}
#ifdef CONFIG_BOOTX_TEXT
map_boot_text();
if (systemcfg->platform == PLATFORM_POWERMAC) {
early_console_initialized = 1;
register_console(&udbg_console);
}
#endif /* CONFIG_BOOTX_TEXT */
#ifdef CONFIG_PPC_PSERIES
if (systemcfg->platform & PLATFORM_PSERIES) {
......@@ -207,14 +231,23 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
rtas_call(rtas_token("start-cpu"), 3, 1,
(void *)&ret,
get_hard_smp_processor_id(i),
*((unsigned long *)pseries_secondary_smp_init), i);
*((unsigned long *)pseries_secondary_smp_init),
i);
cpu_set(i, cpu_possible_map);
systemcfg->processorCount++;
}
}
#endif
}
#endif
#endif /* CONFIG_SMP */
#endif /* CONFIG_PPC_PSERIES */
#ifdef CONFIG_PPC_PMAC
if (systemcfg->platform == PLATFORM_POWERMAC) {
finish_device_tree();
pmac_init(r3, r4, r5, r6, r7);
}
#endif /* CONFIG_PPC_PMAC */
/* Finish initializing the hash table (do the dynamic
* patching for the fast-path hashtable.S code)
*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment