Changeset b3d513f in mainline for boot

Timestamp:

2010-01-05T17:25:29Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

23efd30

Parents:

ed63298

Message:

restructure servers into a more well-arranged hierarchy

Location:

boot

Files:

• Makefile.common (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/sparc64/loader/Makefile.common (modified) (1 diff)

boot/Makefile.common

@@ -45 +45 @@
 
 RD_SRVS = \
-        $(USPACEDIR)/srv/fb/fb \
-        $(USPACEDIR)/srv/kbd/kbd \
-        $(USPACEDIR)/srv/console/console \
+        $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
         $(USPACEDIR)/srv/clip/clip \
+        $(USPACEDIR)/srv/hid/fb/fb \
+        $(USPACEDIR)/srv/hid/kbd/kbd \
+        $(USPACEDIR)/srv/hid/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
+        $(USPACEDIR)/srv/fs/fat/fat
 
 RD_APPS = \
+        $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getterm/getterm \
+        $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/redir/redir \
+        $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \
-        $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh
+        $(USPACEDIR)/app/trace/trace
 
 COMPONENTS = \
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/bd/rd/rd \

boot/arch/amd64/Makefile.inc

@@ -30 +30 @@
 
 RD_SRVS += \
-        $(USPACEDIR)/srv/pci/pci \
         $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
-        $(USPACEDIR)/srv/char/i8042/i8042 \
-        $(USPACEDIR)/srv/mouse/c_mouse/c_mouse
+        $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+        $(USPACEDIR)/srv/hw/bus/pci/pci \
+        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
 
 MODULES := $(notdir $(COMPONENTS))

boot/arch/sparc64/loader/Makefile.common

@@ -46 +46 @@
 RD_SRVS_GENERIC = \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/cir/fhc/fhc \
-        $(USPACEDIR)/srv/cir/obio/obio
+        $(USPACEDIR)/srv/hw/cir/fhc/fhc \
+        $(USPACEDIR)/srv/hw/cir/obio/obio
 
 RD_APPS_GENERIC = \