Rev 1371 | Rev 1474 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1371 | Rev 1374 | ||
|---|---|---|---|
| Line 26... | Line 26... | ||
| 26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | */ |
27 | */ |
| 28 | 28 | ||
| 29 | #include <arch.h> |
29 | #include <arch.h> |
| 30 | #include <arch/boot/boot.h> |
30 | #include <arch/boot/boot.h> |
| 31 | #include <arch/console.h> |
- | |
| 32 | #include <arch/drivers/cuda.h> |
31 | #include <arch/drivers/cuda.h> |
| 33 | #include <arch/mm/memory_init.h> |
32 | #include <arch/mm/memory_init.h> |
| 34 | #include <arch/interrupt.h> |
33 | #include <arch/interrupt.h> |
| - | 34 | #include <genarch/fb/fb.h> |
|
| 35 | #include <userspace.h> |
35 | #include <userspace.h> |
| 36 | #include <proc/uarg.h> |
36 | #include <proc/uarg.h> |
| 37 | 37 | ||
| 38 | bootinfo_t bootinfo; |
38 | bootinfo_t bootinfo; |
| 39 | 39 | ||
| Line 65... | Line 65... | ||
| 65 | if (config.cpu_active == 1) { |
65 | if (config.cpu_active == 1) { |
| 66 | fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); |
66 | fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); |
| 67 | 67 | ||
| 68 | /* Merge all zones to 1 big zone */ |
68 | /* Merge all zones to 1 big zone */ |
| 69 | zone_merge_all(); |
69 | zone_merge_all(); |
| 70 | - | ||
| 71 | ppc32_console_register(); |
- | |
| 72 | } |
70 | } |
| 73 | } |
71 | } |
| 74 | 72 | ||
| 75 | void arch_pre_smp_init(void) |
73 | void arch_pre_smp_init(void) |
| 76 | { |
74 | { |