Changeset 03362fbd in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/arch/amd64/src/amd64.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -43 +43 @@
 #include <arch/bios/bios.h>
 #include <arch/boot/boot.h>
-#include <arch/debugger.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -161 +160 @@
 #endif
                 
-                /* Enable debugger */
-                debugger_init();
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();