Changeset 48e1467 in mainline for boot

Timestamp:

2010-01-22T16:52:17Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0cb2d72

Parents:

92bee46 (diff), 9d3133d (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

Files:

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

boot/Makefile.common

@@ -48 +48 @@
 RD_SRVS = \
         $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/bd/part/guid_part/g_part \
         $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
         $(USPACEDIR)/srv/clip/clip \

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