Merge branch 'stage7' into stage8

Conflicts:
	Makefile.example
	tools/Makefile
This commit is contained in:
Stefan Lankes 2015-01-19 13:15:51 +01:00
commit d489ba9755
3 changed files with 17 additions and 7 deletions

View file

@ -87,7 +87,7 @@ newlib:
READELF_FOR_TARGET=$(READELF_FOR_TARGET) -C newlib
tools:
$(MAKE) ARCH=$(ARCH) BIT=$(BIT) CFLAGS="$(CFLAGS_FOR_TOOLS)" LDFLAGS="$(LDFLAGS_FOR_TOOLS)" -C tools
$Q$(MAKE) ARCH=$(ARCH) BIT=$(BIT) CFLAGS="$(CFLAGS_FOR_TOOLS)" LDFLAGS="$(LDFLAGS_FOR_TOOLS)" -C tools
$(NAME).elf:
$Q$(LD_FOR_TARGET) $(LDFLAGS) -o $(NAME).elf $^

View file

@ -109,7 +109,7 @@ Overview of all branches
7. stage7 - A simple file system
Add a virtual filesystem and a prototype of a initial ramdiks
Add a virtual filesystem and a prototype of an initial ramdisk
8. stage8 - HelloWorld in user space

View file

@ -4,25 +4,35 @@ CFLAGS = -O2 -Wall -m32
LDFLGAS =
EXECFILES = $(shell find ../newlib/examples -perm -u+r+x -type f)
# Prettify output
V = 0
ifeq ($V,0)
Q = @
P = > /dev/null
endif
# other implicit rules
%.o : %.c
$(CC) -c $(CFLAGS) -o $@ $<
@echo [CC] $@
$Q$(CC) -c $(CFLAGS) -o $@ $<
default: all
all: make_initrd initrd.img
initrd.img: $(EXECFILES) make_initrd
./make_initrd /bin $(foreach FILE, $(EXECFILES), $(FILE) $(shell basename $(FILE)))
@echo [MAKE_INITRD] initrd.img
$Q./make_initrd /bin $(foreach FILE, $(EXECFILES), $(FILE) $(shell basename $(FILE)))
make_initrd: make_initrd.o
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
$Q$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
clean:
$(RM) -rf *.o *~ make_initrd initrd.img
@echo Cleaning tools
$Q$(RM) -rf *.o *~ make_initrd initrd.img
depend:
$(CC) -MM $(CFLAGS) *.c > Makefile.dep
$Q$(CC) -MM $(CFLAGS) *.c > Makefile.dep
-include Makefile.dep
# DO NOT DELETE