Changeset f4f866c in mainline for boot

Timestamp:

2010-04-23T21:42:26Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.

Location:

boot

Files:

• Makefile.common (modified) (5 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff, 1 prop)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/loader/main.c (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/loader/asm.h (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -40 +40 @@
         $(USPACEDIR)/srv/bd/rd/rd \
         $(USPACEDIR)/srv/vfs/vfs
+
 ifeq ($(RDFMT),tmpfs)
         INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
 endif
+
 ifeq ($(RDFMT),fat)
         INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
@@ -60 +62 @@
         $(USPACEDIR)/srv/taskmon/taskmon \
         $(USPACEDIR)/srv/hw/netif/dp8390/dp8390 \
+        $(USPACEDIR)/srv/net/netif/lo/lo \
+        $(USPACEDIR)/srv/net/il/arp/arp \
+        $(USPACEDIR)/srv/net/il/ip/ip \
+        $(USPACEDIR)/srv/net/tl/icmp/icmp \
+        $(USPACEDIR)/srv/net/tl/udp/udp \
+        $(USPACEDIR)/srv/net/tl/tcp/tcp \
         $(USPACEDIR)/srv/net/net/net \
         $(USPACEDIR)/srv/net/netstart/netstart \
-        $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/nil/eth/eth \
-        $(USPACEDIR)/srv/net/nil/nildummy/nildummy
+
+ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/net/nil/eth/eth \
+                $(USPACEDIR)/srv/net/nil/nildummy/nildummy
+endif
 
 RD_APPS = \
@@ -78 +89 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/trace/trace \
+        $(USPACEDIR)/app/nettest1/nettest1 \
+        $(USPACEDIR)/app/nettest2/nettest2 \
         $(USPACEDIR)/app/netecho/netecho \
         $(USPACEDIR)/app/ping/ping \
-        $(USPACEDIR)/app/nettest1/nettest1 \
-        $(USPACEDIR)/app/nettest2/nettest2
+        $(USPACEDIR)/app/stats/stats \
+        $(USPACEDIR)/app/tasks/tasks \
+        $(USPACEDIR)/app/top/top
+#       $(USPACEDIR)/app/dummy_load/dummy_load
 
 COMPONENTS = \
@@ -91 +106 @@
         $(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
@@ -99 +116 @@
 
 NET_CFG = \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/general \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/lo \
-        $(USPACEDIR)/srv/net/cfg/$(CONFIG_NETWORKING)/ne2k
-
-ifeq ($(CONFIG_NETWORKING),modular)
-        RD_SRVS += \
-                $(USPACEDIR)/srv/net/il/ip/ip \
-                $(USPACEDIR)/srv/net/il/arp/arp \
-                $(USPACEDIR)/srv/net/tl/udp/udp \
-                $(USPACEDIR)/srv/net/tl/tcp/tcp \
-                $(USPACEDIR)/srv/net/tl/icmp/icmp
-endif
+        $(USPACEDIR)/srv/net/cfg/general \
+        $(USPACEDIR)/srv/net/cfg/lo \
+        $(USPACEDIR)/srv/net/cfg/ne2k

boot/arch/amd64/Makefile.inc

@@ -39 +39 @@
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         mkdir -p $(TMP)/boot/grub
         cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/

boot/arch/arm32/Makefile.inc

@@ -27 +27 @@
 #
 
+include Makefile.common
+
 build: $(BASE)/image.boot
 
-$(BASE)/image.boot:
+$(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
         cp arch/$(BARCH)/loader/image.boot $@

boot/arch/arm32/loader/main.c

@@ -48 +48 @@
 
 /** Kernel entry point address. */
-#define KERNEL_VIRTUAL_ADDRESS 0x80200000
+#define KERNEL_VIRTUAL_ADDRESS 0x80800000
 
 

boot/arch/ia64/Makefile.inc

@@ -27 +27 @@
 #
 
+include Makefile.common
+
 build: $(BASE)/image.boot
 
-$(BASE)/image.boot:
+$(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
         cp arch/$(BARCH)/loader/image.boot $@

boot/arch/mips32/Makefile.inc

@@ -27 +27 @@
 #
 
+include Makefile.common
+
 build: $(BASE)/image.boot
 
-$(BASE)/image.boot:
+$(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
         cp arch/$(BARCH)/loader/image.boot $@

boot/arch/ppc32/Makefile.inc

@@ -41 +41 @@
         mkisofs -hfs -part -map arch/$(BARCH)/yaboot/maps -no-desktop -hfs-volid "HelenOS" -hfs-bless $(TMP)/boot -r -o $@ $(TMP)/
 
-arch/$(BARCH)/loader/image.boot:
+arch/$(BARCH)/loader/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
 

boot/arch/ppc32/loader/asm.h

@@ -33 +33 @@
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define TRANS_SIZE   1024
+#define TRANS_SIZE   2048
 #define BOOT_OFFSET  0x8000
 

boot/arch/sparc64/Makefile.inc

@@ -54 +54 @@
         mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
 
-arch/$(BARCH)/loader/image.boot:
+arch/$(BARCH)/loader/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)