Subversion Repositories HelenOS

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2432 → Rev 2431

/branches/fs/boot/arch/mips32/ramdisk/ramdisk.img.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/mips32/ramdisk/ramdisk.header
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/mips32/ramdisk/Makefile.inc
File deleted
/branches/fs/boot/arch/mips32/ramdisk/ramdisk.img
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/mips32/loader/Makefile
74,17 → 74,16
$(USPACEDIR)/kbd/kbd \
$(USPACEDIR)/console/console \
$(USPACEDIR)/tetris/tetris \
$(USPACEDIR)/tester/tester \
$(USPACEDIR)/klog/klog
# $(USPACEDIR)/rd/rd \
# $(USPACEDIR)/fs/fs \
# $(USPACEDIR)/cat/cat
$(USPACEDIR)/ipcc/ipcc \
$(USPACEDIR)/klog/klog \
$(USPACEDIR)/rd/rd \
$(USPACEDIR)/fs/fs \
$(USPACEDIR)/cat/cat \
arch/$(ARCH)/ramdisk/ramdisk.img
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 
#-include ../../../arch/$(ARCH)/ramdisk/Makefile.inc
 
.PHONY: all clean depend
 
all: image.boot
91,8 → 90,7
 
-include Makefile.depend
 
image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) kernel.o
# $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) ../../../arch/$(ARCH)/loader/ramdisk.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:
102,7 → 100,6
-rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
# ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS) ../../../arch/$(ARCH)/ramdisk/ramdisk.img
./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
 
%.o: %.S
/branches/fs/boot/arch/mips32/Makefile.inc
26,8 → 26,6
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
#-include arch/$(ARCH)/ramdisk/Makefile.inc
 
build: $(BASE)/image.boot
 
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
/branches/fs/boot/arch/ppc32/ramdisk/ramdisk.img.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ppc32/ramdisk/ramdisk.header
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ppc32/ramdisk/Makefile.inc
File deleted
/branches/fs/boot/arch/ppc32/ramdisk/ramdisk.img
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ppc32/Makefile.inc
26,8 → 26,6
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
-include arch/$(ARCH)/ramdisk/Makefile.inc
 
build: $(BASE)/image.boot
 
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
/branches/fs/boot/arch/ppc32/loader/Makefile
75,12 → 75,8
$(USPACEDIR)/kbd/kbd \
$(USPACEDIR)/console/console \
$(USPACEDIR)/tetris/tetris \
$(USPACEDIR)/tester/tester \
$(USPACEDIR)/klog/klog \
$(USPACEDIR)/rd/rd \
$(USPACEDIR)/fs/fs \
$(USPACEDIR)/cat/cat \
../../../arch/$(ARCH)/ramdisk/ramdisk.img
$(USPACEDIR)/ipcc/ipcc \
$(USPACEDIR)/klog/klog
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
91,7 → 87,7
 
-include Makefile.depend
 
image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
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:
/branches/fs/boot/arch/ia32xen/ramdisk/ramdisk.header
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ia32xen/ramdisk/Makefile.inc
File deleted
/branches/fs/boot/arch/ia32xen/ramdisk/ramdisk.img.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ia32xen/Makefile.inc
26,8 → 26,6
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
-include arch/$(ARCH)/ramdisk/Makefile.inc
 
TASKS = \
$(USPACEDIR)/init/init \
$(USPACEDIR)/ns/ns \
36,12 → 34,8
$(USPACEDIR)/kbd/kbd \
$(USPACEDIR)/console/console \
$(USPACEDIR)/tetris/tetris \
$(USPACEDIR)/tester/tester \
$(USPACEDIR)/ipcc/ipcc \
$(USPACEDIR)/klog/klog
$(USPACEDIR)/rd/rd \
$(USPACEDIR)/fs/fs \
$(USPACEDIR)/cat/cat \
arch/$(ARCH)/ramdisk/ramdisk.img
 
build: $(BASE)/image.iso
 
/branches/fs/boot/arch/ia32xen/grub/menu.debug.lst
12,9 → 12,5
module /boot/kbd
module /boot/console
module /boot/tetris
module /boot/tester
module /boot/ipcc
module /boot/klog
module /boot/rd
module /boot/fs
module /boot/cat
module /boot/ramdisk.img
/branches/fs/boot/arch/ia32xen/grub/menu.lst
12,9 → 12,5
module /boot/kbd
module /boot/console
module /boot/tetris
module /boot/tester
module /boot/ipcc
module /boot/klog
module /boot/rd
module /boot/fs
module /boot/cat
module /boot/ramdisk.img
/branches/fs/boot/arch/amd64/Makefile.inc
26,8 → 26,6
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
-include arch/$(ARCH)/ramdisk/Makefile.inc
 
TASKS = \
$(USPACEDIR)/init/init \
$(USPACEDIR)/ns/ns \
36,12 → 34,8
$(USPACEDIR)/kbd/kbd \
$(USPACEDIR)/console/console \
$(USPACEDIR)/tetris/tetris \
$(USPACEDIR)/tester/tester \
$(USPACEDIR)/klog/klog \
$(USPACEDIR)/rd/rd \
$(USPACEDIR)/fs/fs \
$(USPACEDIR)/cat/cat \
arch/$(ARCH)/ramdisk/ramdisk.img
$(USPACEDIR)/ipcc/ipcc \
$(USPACEDIR)/klog/klog
 
build: $(BASE)/image.iso
 
/branches/fs/boot/arch/amd64/grub/menu.lst
11,9 → 11,5
module /boot/kbd
module /boot/console
module /boot/tetris
module /boot/tester
module /boot/ipcc
module /boot/klog
module /boot/rd
module /boot/fs
module /boot/cat
module /boot/ramdisk.img
/branches/fs/boot/arch/ppc64/ramdisk/ramdisk.img.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ppc64/ramdisk/ramdisk.header
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/branches/fs/boot/arch/ppc64/ramdisk/Makefile.inc
File deleted
/branches/fs/boot/arch/ppc64/Makefile.inc
26,8 → 26,6
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
-include arch/$(ARCH)/ramdisk/Makefile.inc
 
build: $(BASE)/image.boot
 
$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
/branches/fs/boot/arch/ppc64/loader/Makefile
75,12 → 75,8
$(USPACEDIR)/kbd/kbd \
$(USPACEDIR)/console/console \
$(USPACEDIR)/tetris/tetris \
$(USPACEDIR)/tester/tester \
$(USPACEDIR)/klog/klog \
$(USPACEDIR)/rd/rd \
$(USPACEDIR)/fs/fs \
$(USPACEDIR)/cat/cat \
arch/$(ARCH)/ramdisk/ramdisk.img
$(USPACEDIR)/ipcc/ipcc \
$(USPACEDIR)/klog/klog
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
91,7 → 87,7
 
-include Makefile.depend
 
image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
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: