Changeset 3eee37d in mainline for arch/ppc32/loader/Makefile

Timestamp:

2006-05-18T19:42:34Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

de1b8b1

Parents:

a62347a

Message:

support for arbitrary number of boot components for ppc32

File:

• arch/ppc32/loader/Makefile (modified) (3 diffs)

arch/ppc32/loader/Makefile

@@ -57 +57 @@
         boot.S
 
+COMPONENTS = \
+        $(KERNELDIR)/kernel.bin \
+        $(USPACEDIR)/ns/ns \
+        $(USPACEDIR)/init/init \
+        $(USPACEDIR)/fb/fb
+
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 
 .PHONY: all clean depend
@@ -65 +72 @@
 -include Makefile.depend
 
-image.boot: depend $(OBJECTS) kernel.o init.o
-        $(LD) -no-check-sections -N -T _link.ld $(OBJECTS) kernel.o init.o -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) kernel.o 
+        $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
 
 depend:
@@ -72 +79 @@
 
 clean:
-        -rm -f $(OBJECTS) image.boot kernel.o init.o Makefile.depend
+        -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
-kernel.o: $(KERNEL)
-        $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common --rename-section .data=.kernel_image $(KERNEL) $@
-
-init.o: $(INIT)
-        $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common --rename-section .data=.init_image $(INIT) $@
+_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
+        ./pack $(OBJCOPY) $(COMPONENTS)
 
 %.o: %.S