Changeset 49ff5f3 in mainline for kernel/Makefile

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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/Makefile (modified) (3 diffs)

kernel/Makefile

@@ -90 +90 @@
 endif
 
-DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -229 +229 @@
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
+        generic/src/mm/km.c \
         generic/src/mm/reserve.c \
         generic/src/mm/buddy.c \
@@ -245 +246 @@
         generic/src/lib/str.c \
         generic/src/lib/elf.c \
+        generic/src/lib/ra.c \
         generic/src/lib/rd.c \
         generic/src/printf/printf_core.c \