Changeset efedee77 in mainline for boot

Timestamp:

2010-11-02T22:38:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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 (modified) (2 diffs)
• Makefile.common (modified) (3 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/arm32/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)
@@ -74 +82 @@
         rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
         rm -f $(USPACE_PATH)/dist/srv/*
+        rm -rf $(USPACE_PATH)/dist/drv/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*

boot/Makefile.common

@@ -49 +49 @@
 DIST_PATH = $(USPACE_PATH)/dist
 TOOLS_PATH = $(ROOT_PATH)/tools
+DRVS_PATH = drv
 
 SANDBOX = pack
@@ -107 +108 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/net/netstart/netstart \
+        $(USPACE_PATH)/srv/devman/devman
+        
+RD_DRVS = \
+        root
+
+RD_DRV_CFG = 
 
 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
@@ -126 +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

@@ -34 +34 @@
 RD_SRVS_NON_ESSENTIAL += \
         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
-        $(USPACE_PATH)/srv/hw/bus/pci/pci \
         $(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

boot/arch/arm32/Makefile.inc

@@ -42 +42 @@
 
 RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
         $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser