Changeset db4d6de in mainline for boot/arch/arm32/loader/Makefile

Timestamp:

2009-11-28T16:30:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c4702804

Parents:

ba8f8cb (diff), 67392fa (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/arm32/loader/Makefile (modified) (2 diffs)

boot/arch/arm32/loader/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2006 Martin Decky
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-include ../../../../version
--include ../../../../Makefile.config
+include Makefile.common
 
-## Toolchain configuration
-#
+.PHONY: all clean
 
-ifndef CROSS_PREFIX
-        CROSS_PREFIX = /usr/local
-endif
-
-BFD_NAME = elf32-littlearm
-BFD_ARCH = arm
-TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
-
-ifeq ($(COMPILER),gcc_native)
-        CC = gcc
-        AS = as
-        LD = ld
-        OBJCOPY = objcopy
-        OBJDUMP = objdump
-endif
-
-ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
-endif
-
-CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
-
-SOURCES = \
-        main.c \
-        boot.S \
-        asm.S \
-        mm.c \
-        print/print.c \
-        _components.c \
-        ../../../generic/printf.c \
-        ../../../generic/string.c \
-        ../../../genarch/division.c
-
-COMPONENTS = \
-        $(KERNELDIR)/kernel.bin \
-        $(USPACEDIR)/srv/ns/ns \
-        $(USPACEDIR)/srv/loader/loader \
-        $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/devmap/devmap \
-        $(USPACEDIR)/srv/bd/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs
-ifeq ($(RDFMT),tmpfs)
-        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
-endif
-ifeq ($(RDFMT),fat)
-        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
-endif
-
-RD_SRVS = \
-        $(USPACEDIR)/srv/fb/fb \
-        $(USPACEDIR)/srv/kbd/kbd \
-        $(USPACEDIR)/srv/console/console \
-        $(USPACEDIR)/srv/fs/devfs/devfs \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd \
-        $(USPACEDIR)/srv/part/mbr_part/mbr_part
-ifeq ($(MACHINE),testarm)
-        RD_SRVS += \
-                $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
-endif
-
-RD_APPS = \
-        $(USPACEDIR)/app/edit/edit \
-        $(USPACEDIR)/app/getvc/getvc \
-        $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
-
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
-
-.PHONY: all clean depend
-
-all: image.boot
-
--include Makefile.depend
-
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
-        $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
-
-depend:
-        -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build
 
 clean:
-        -for file in $(RD_SRVS) ; do \
+        for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
         done
-        -for file in $(RD_APPS) ; do \
+        for file in $(RD_APPS) ; do \
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
-
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
-        for file in $(RD_SRVS) ; do \
-                cp $$file $(USPACEDIR)/dist/srv/ ; \
-        done
-        for file in $(RD_APPS) ; do \
-                cp $$file $(USPACEDIR)/dist/app/ ; \
-        done
-ifeq ($(RDFMT),tmpfs)
-        ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
-endif
-ifeq ($(RDFMT),fat)
-        ../../../../tools/mkfat.py $(USPACEDIR)/dist/ initrd.fs
-endif
-        ../../../../tools/mkhord.py 4096 initrd.fs initrd.img
-        rm initrd.fs
-        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
-
-%.o: %.S
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
+        find . -name '*.o' -follow -exec rm \{\} \;
+        find . -name '*.co' -follow -exec rm \{\} \;