Changeset aaa70841 in mainline

Timestamp:

2008-07-01T19:19:33Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7560b606

Parents:

d987fd7

Message:

Use initrd with mips32 port. Increase memory size.

Files:

• boot/arch/mips32/loader/Makefile (modified) (3 diffs)
• kernel/generic/include/config.h (modified) (1 diff)

boot/arch/mips32/loader/Makefile

@@ -81 +81 @@
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/app/init/init \
+        $(USPACEDIR)/srv/devmap/devmap \
+        $(USPACEDIR)/srv/rd/rd \
+        $(USPACEDIR)/srv/vfs/vfs \
+        $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+
+RD_TASKS = \
         $(USPACEDIR)/srv/fb/fb \
         $(USPACEDIR)/srv/kbd/kbd \
         $(USPACEDIR)/srv/console/console \
-        $(USPACEDIR)/srv/vfs/vfs \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/devmap/devmap \
-        $(USPACEDIR)/app/init/init \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
@@ -102 +105 @@
 -include Makefile.depend
 
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-        $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+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:
@@ -109 +112 @@
 
 clean:
-        -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+        -for task in $(RD_TASKS) ; do \
+                rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+        done
+        -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
-        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in
+        for task in $(RD_TASKS) ; do \
+                cp $$task $(USPACEDIR)/dist/sbin/ ; \
+        done
+        ../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
+        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned int" $(COMPONENTS) ./initrd.img
 
 _link.ld.in: _link.ld.in.$(LD_IN)

kernel/generic/include/config.h

@@ -41 +41 @@
 #define STACK_SIZE              PAGE_SIZE
 
-#define CONFIG_MEMORY_SIZE      (8 * 1024 * 1024)
+#define CONFIG_MEMORY_SIZE      (16 * 1024 * 1024)
 
 #define CONFIG_INIT_TASKS       32