setup_32.c (463ce0e103f419f51b1769111e73fe8bb305d0ec) | setup_32.c (51d3082fe6e55aecfa17113dbe98077c749f724c) |
---|---|
1/* 2 * Common prep/pmac/chrp boot and setup code. 3 */ 4 5#include <linux/config.h> 6#include <linux/module.h> 7#include <linux/string.h> 8#include <linux/sched.h> --- 26 unchanged lines hidden (view full) --- 35#include <asm/uaccess.h> 36#include <asm/system.h> 37#include <asm/pmac_feature.h> 38#include <asm/sections.h> 39#include <asm/nvram.h> 40#include <asm/xmon.h> 41#include <asm/time.h> 42#include <asm/serial.h> | 1/* 2 * Common prep/pmac/chrp boot and setup code. 3 */ 4 5#include <linux/config.h> 6#include <linux/module.h> 7#include <linux/string.h> 8#include <linux/sched.h> --- 26 unchanged lines hidden (view full) --- 35#include <asm/uaccess.h> 36#include <asm/system.h> 37#include <asm/pmac_feature.h> 38#include <asm/sections.h> 39#include <asm/nvram.h> 40#include <asm/xmon.h> 41#include <asm/time.h> 42#include <asm/serial.h> |
43#include <asm/udbg.h> |
|
43 44#include "setup.h" 45 46#define DBG(fmt...) 47 48#if defined CONFIG_KGDB 49#include <asm/kgdb.h> 50#endif --- 117 unchanged lines hidden (view full) --- 168/* 169 * Find out what kind of machine we're on and save any data we need 170 * from the early boot process (devtree is copied on pmac by prom_init()). 171 * This is called very early on the boot process, after a minimal 172 * MMU environment has been set up but before MMU_init is called. 173 */ 174void __init machine_init(unsigned long dt_ptr, unsigned long phys) 175{ | 44 45#include "setup.h" 46 47#define DBG(fmt...) 48 49#if defined CONFIG_KGDB 50#include <asm/kgdb.h> 51#endif --- 117 unchanged lines hidden (view full) --- 169/* 170 * Find out what kind of machine we're on and save any data we need 171 * from the early boot process (devtree is copied on pmac by prom_init()). 172 * This is called very early on the boot process, after a minimal 173 * MMU environment has been set up but before MMU_init is called. 174 */ 175void __init machine_init(unsigned long dt_ptr, unsigned long phys) 176{ |
177 /* If btext is enabled, we might have a BAT setup for early display, 178 * thus we do enable some very basic udbg output 179 */ 180#ifdef CONFIG_BOOTX_TEXT 181 udbg_putc = btext_drawchar; 182#endif 183 184 /* Do some early initialization based on the flat device tree */ |
|
176 early_init_devtree(__va(dt_ptr)); 177 | 185 early_init_devtree(__va(dt_ptr)); 186 |
187 /* Check default command line */ |
|
178#ifdef CONFIG_CMDLINE | 188#ifdef CONFIG_CMDLINE |
179 strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line)); | 189 if (cmd_line[0] == 0) 190 strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line)); |
180#endif /* CONFIG_CMDLINE */ 181 | 191#endif /* CONFIG_CMDLINE */ 192 |
193 /* Base init based on machine type */ |
|
182 platform_init(); 183 184#ifdef CONFIG_6xx 185 ppc_md.power_save = ppc6xx_idle; 186#endif 187 188 if (ppc_md.progress) 189 ppc_md.progress("id mach(): done", 0x200); --- 99 unchanged lines hidden (view full) --- 289 290#ifdef CONFIG_PPC_MULTIPLATFORM 291 find_legacy_serial_ports(); 292#endif 293 finish_device_tree(); 294 295 smp_setup_cpu_maps(); 296 | 194 platform_init(); 195 196#ifdef CONFIG_6xx 197 ppc_md.power_save = ppc6xx_idle; 198#endif 199 200 if (ppc_md.progress) 201 ppc_md.progress("id mach(): done", 0x200); --- 99 unchanged lines hidden (view full) --- 301 302#ifdef CONFIG_PPC_MULTIPLATFORM 303 find_legacy_serial_ports(); 304#endif 305 finish_device_tree(); 306 307 smp_setup_cpu_maps(); 308 |
297#ifdef CONFIG_BOOTX_TEXT 298 init_boot_display(); 299#endif 300 301#ifdef CONFIG_PPC_PMAC 302 /* This could be called "early setup arch", it must be done 303 * now because xmon need it 304 */ 305 if (_machine == _MACH_Pmac) 306 pmac_feature_init(); /* New cool way */ 307#endif 308 | |
309#ifdef CONFIG_XMON_DEFAULT 310 xmon_init(1); 311#endif | 309#ifdef CONFIG_XMON_DEFAULT 310 xmon_init(1); 311#endif |
312 /* Register early console */ 313 register_early_udbg_console(); |
|
312 313#if defined(CONFIG_KGDB) 314 if (ppc_md.kgdb_map_scc) 315 ppc_md.kgdb_map_scc(); 316 set_debug_traps(); 317 if (strstr(cmd_line, "gdb")) { 318 if (ppc_md.progress) 319 ppc_md.progress("setup_arch: kgdb breakpoint", 0x4000); --- 54 unchanged lines hidden --- | 314 315#if defined(CONFIG_KGDB) 316 if (ppc_md.kgdb_map_scc) 317 ppc_md.kgdb_map_scc(); 318 set_debug_traps(); 319 if (strstr(cmd_line, "gdb")) { 320 if (ppc_md.progress) 321 ppc_md.progress("setup_arch: kgdb breakpoint", 0x4000); --- 54 unchanged lines hidden --- |