Changeset 383ddd6 in mainline for boot/arch

Timestamp:

2010-01-20T20:33:55Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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.

Location:

boot/arch/ia64/loader

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (2 diffs)
• gefi/HelenOS/Makefile (modified) (2 diffs)

boot/arch/ia64/loader/Makefile

@@ -29 +29 @@
 
 include Makefile.common
+include ../../../../Makefile.config
 
 .PHONY: all clean

boot/arch/ia64/loader/Makefile.common

@@ -31 +31 @@
 #
 
+include ../../../../Makefile.config
 include ../../../Makefile.common
 
@@ -44 +45 @@
 KERNELDIR = ../../../../kernel
 USPACEDIR = ../../../../uspace
+
+ifeq ($(MACHINE),i460GX)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+endif

boot/arch/ia64/loader/gefi/HelenOS/Makefile

@@ -33 +33 @@
 FORMAT          = efi-app-$(ARCH)
 
-all:    gefi hello.efi
+all:    hello.efi
 
 clean:
@@ -46 +46 @@
 #When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
 #hello.so: hello.o image.o division.o
-hello.so: hello.o image.bin division.o
+hello.so: hello.o image.bin division.o gefi
 #       $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
         $(LD) $(LDFLAGS) -Map hello.map hello.o division.o -o hello.so $(LOADLIBES) #dont link image inside hello