Changeset 04cb68f2 in mainline for boot

Timestamp:

2010-10-20T19:30:54Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

78a9e5ef

Parents:

e0e568ff (diff), a6e54c5d (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 from lp:~helenos-dd/helenos/dd.

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (3 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile

@@ -61 +61 @@
                 cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
         done
-
+        for drv in $(RD_DRVS) ; do \
+                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
+        done
+        for file in $(RD_DRV_CFG) ; do \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
+        done
+        
 clean: clean_dist
         $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)

boot/Makefile.common

@@ -49 +49 @@
 DIST_PATH = $(USPACE_PATH)/dist
 TOOLS_PATH = $(ROOT_PATH)/tools
+DRVS_PATH = srv/drivers
 
 SANDBOX = pack
@@ -106 +107 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/net/netstart/netstart \
+        $(USPACE_PATH)/srv/devman/devman \
+        $(USPACE_PATH)/srv/drivers/root/root 
+        
+RD_DRVS = \
+        root
+
+RD_DRV_CFG = 
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
@@ -125 +133 @@
         $(USPACE_PATH)/app/taskdump/taskdump \
         $(USPACE_PATH)/app/tester/tester \
+        $(USPACE_PATH)/app/test_serial/test_serial \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
         $(USPACE_PATH)/srv/hid/char_mouse/char_ms
 
+RD_DRVS += \
+        rootia32 \
+        pciintel \
+        isa \
+        ns8250
+        
+RD_DRV_CFG += \
+        isa/isa.dev
+
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img