Changeset 00aece0 in mainline for kernel/genarch/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/genarch/Makefile.inc (modified) (2 diffs)

kernel/genarch/Makefile.inc

@@ -67 +67 @@
                 genarch/src/fb/font-8x16.c \
                 genarch/src/fb/logo-196x66.c \
-                genarch/src/fb/fb.c
+                genarch/src/fb/fb.c \
+                genarch/src/fb/bfb.c
 endif
 
@@ -143 +144 @@
 ifeq ($(CONFIG_MULTIBOOT), y)
         GENARCH_SOURCES += \
-                genarch/src/multiboot/multiboot.c
+                genarch/src/multiboot/multiboot.c \
+                genarch/src/multiboot/multiboot2.c
 endif