Changeset 89c57b6 in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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:

• boot/arch/arm32/Makefile.inc (modified) (3 diffs)

boot/arch/arm32/Makefile.inc

@@ -27 +27 @@
 #
 
+ifeq ($(MACHINE), gta02)
+        BOOT_OUTPUT = image.boot
+        POST_OUTPUT = $(ROOT_PATH)/uImage.bin
+        POSTBUILD = Makefile.uboot
+endif
+
 BFD_NAME = elf32-littlearm
 BFD_OUTPUT = $(BFD_NAME)
@@ -35 +41 @@
 PAGE_SIZE = 4096
 
-RD_SRVS_ESSENTIAL +=
+RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
 
 RD_SRVS_NON_ESSENTIAL += \
@@ -47 +55 @@
         $(COMPS_C) \
         genarch/src/division.c \
+        generic/src/memstr.c \
         generic/src/printf_core.c \
         generic/src/vprintf.c \