Changeset b50b5af2 in mainline for boot/arch/ppc32/loader/Makefile

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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/ppc32/loader/Makefile (modified) (3 diffs)

boot/arch/ppc32/loader/Makefile

@@ -62 +62 @@
 SOURCES = \
         main.c \
-        ofwarch.c \
         _components.c \
-        ../../../genarch/ofw.c \
         ../../../generic/printf.c \
         ../../../generic/string.c \
+        ../../../genarch/balloc.c \
+        ../../../genarch/ofw.c \
+        ../../../genarch/ofw_tree.c \
+        ofwarch.c \
         asm.S \
         boot.S
@@ -73 +75 @@
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/app/init/init \
         $(USPACEDIR)/srv/loader/loader \
-        $(USPACEDIR)/app/init/init \
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/bd/rd/rd \
@@ -102 +104 @@
         $(USPACEDIR)/app/dltest2/dltest2 \
         $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
+        $(USPACEDIR)/app/bdsh/bdsh \
+        $(USPACEDIR)/app/klog/klog
 
 RD_LIBS = \