Changeset 338a8382 in mainline for boot/arch/sparc64/loader/Makefile

Timestamp:

2008-10-12T22:35:46Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94f8e3c1

Parents:

756f475

Message:

Introduce a boot component configuration option CONFIG_RD_EXTERNAL.
Currently used by the sparc64 port. It says whether the ramdisk
is part of image.boot or a separate file.

File:

• boot/arch/sparc64/loader/Makefile (modified) (6 diffs)

boot/arch/sparc64/loader/Makefile

@@ -80 +80 @@
         boot.S
 
+#
+# All components that go to image.boot without the ramdisk.
+#
 COMPONENTS = \
         $(KERNELDIR)/kernel.bin \
@@ -93 +96 @@
 ifeq ($(RDFMT),fat)
         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+
+#
+# Final list of all components that go to image.boot.
+#
+ALL_COMPONENTS = $(COMPONENTS)
+ifeq ($(CONFIG_RD_EXTERNAL),n)
+        ALL_COMPONENTS += ./initrd.img
 endif
 
@@ -110 +121 @@
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
+ALL_COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(ALL_COMPONENTS))))
 
 .PHONY: all clean depend
@@ -118 +129 @@
 -include Makefile.depend
 
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-        $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS)
+        $(LD) -Map image.map -no-check-sections -N -T _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) -o $@
 
 depend:
@@ -131 +142 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
+        -rm -f _components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS): $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
@@ -148 +159 @@
         ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
         rm initrd.fs
-        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS)
+        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(ALL_COMPONENTS)
 
 %.o: %.S