Changeset 00aece0 in mainline for kernel/arch/amd64/Makefile.inc

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

File:

• kernel/arch/amd64/Makefile.inc (modified) (3 diffs)

kernel/arch/amd64/Makefile.inc

@@ -72 +72 @@
 ARCH_SOURCES = \
         arch/$(KARCH)/src/fpu_context.c \
-        arch/$(KARCH)/src/boot/boot.S \
+        arch/$(KARCH)/src/boot/multiboot.S \
+        arch/$(KARCH)/src/boot/multiboot2.S \
         arch/$(KARCH)/src/boot/memmap.c \
         arch/$(KARCH)/src/debug/stacktrace.c \
@@ -79 +80 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/ddi/ddi.c \
-        arch/$(KARCH)/src/drivers/vesa.c \
         arch/$(KARCH)/src/drivers/i8254.c \
         arch/$(KARCH)/src/drivers/i8259.c \
@@ -86 +86 @@
         arch/$(KARCH)/src/bios/bios.c \
         arch/$(KARCH)/src/interrupt.c \
+        arch/$(KARCH)/src/mm/km.c \
         arch/$(KARCH)/src/mm/as.c \
         arch/$(KARCH)/src/mm/frame.c \