Changeset bee37cf in mainline for boot

Timestamp:

2011-07-05T21:21:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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) (1 diff)
• Makefile.common (modified) (4 diffs)
• Makefile.silo (modified) (1 diff)
• Makefile.uboot (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips64/Makefile.inc (added)
• arch/mips64/_link.ld.in (added)
• arch/mips64/include/arch.h (added)
• arch/mips64/include/asm.h (added)
• arch/mips64/include/main.h (added)
• arch/mips64/include/regname.h (added)
• arch/mips64/include/types.h (added)
• arch/mips64/src/asm.S (added)
• arch/mips64/src/main.c (added)
• arch/mips64/src/putchar.c (added)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/src/main.c (modified) (1 diff)
• generic/src/version.c (modified) (1 diff)
• silo/raw/isofs.b (deleted)
• silo/raw/second.b (deleted)

boot/Makefile

@@ -65 +65 @@
         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" ; \
+                drv_dir="`dirname "$$drv"`" ; \
+                drv_name="`basename "$$drv"`" ; \
+                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
         done
         for file in $(RD_DRV_CFG) ; do \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
+                file_dir="`dirname "$$file"`" ; \
+                file_name="`basename "$$file"`" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
-        
+
 clean: clean_dist
         $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)

boot/Makefile.common

@@ -86 +86 @@
 RD_SRVS_ESSENTIAL = \
         $(USPACE_PATH)/srv/hid/fb/fb \
-        $(USPACE_PATH)/srv/hid/kbd/kbd \
+        $(USPACE_PATH)/srv/hid/input/input \
         $(USPACE_PATH)/srv/hid/console/console \
         $(USPACE_PATH)/srv/fs/devfs/devfs
@@ -110 +110 @@
         $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
-        
+
 RD_DRVS = \
-        root \
-        rootvirt \
-        test1 \
-        test2 \
-        test3
-
-RD_DRV_CFG = 
+        infrastructure/root \
+        infrastructure/rootvirt \
+        test/test1 \
+        test/test2 \
+        test/test3
+
+RD_DRV_CFG =
 
 RD_LIBS =
@@ -146 +146 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \
@@ -158 +159 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
+        $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
-        $(USPACE_PATH)/app/sysinfo/sysinfo \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/vuhid/vuh \
+        $(USPACE_PATH)/app/mkbd/mkbd \
         $(USPACE_PATH)/app/websrv/websrv
 

boot/Makefile.silo

@@ -31 +31 @@
 include Makefile.common
 
-ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-        SILO_PACKAGE = a.out
-else
-        SILO_PACKAGE = raw
-endif
+SILO_PACKAGE = a.out
 
 ISOFS_B = silo/$(SILO_PACKAGE)/isofs.b

boot/Makefile.uboot

@@ -31 +31 @@
 include Makefile.common
 
-IMAGE_NAME=HelenOS-$(RELEASE)
-BIN_OUTPUT=image.bin
+IMAGE_NAME = HelenOS-$(RELEASE)
+BIN_OUTPUT = image.bin
 
 all: $(POST_OUTPUT)
@@ -40 +40 @@
 
 $(POST_OUTPUT): $(BIN_OUTPUT)
-        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 \
-    $< $@
+        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 $< $@
 
 clean:

boot/arch/amd64/Makefile.inc

@@ -35 +35 @@
 
 RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd \
-        $(USPACE_PATH)/srv/hid/char_mouse/char_ms
+        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
 
 RD_DRVS += \
-        rootpc \
-        pciintel \
-        isa \
-        ns8250
+        infrastructure/rootpc \
+        bus/pci/pciintel \
+        bus/isa \
+        char/ns8250 \
+        bus/usb/ehci\
+        bus/usb/ohci \
+        bus/usb/uhci \
+        bus/usb/uhcirh \
+        bus/usb/usbflbk \
+        bus/usb/usbhub \
+        bus/usb/usbhid \
+        bus/usb/usbmast \
+        bus/usb/usbmid \
+        bus/usb/usbmouse \
+        bus/usb/vhc
 
 RD_DRV_CFG += \
-        isa/isa.dev
+        bus/isa
 
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso

boot/arch/mips32/Makefile.inc

@@ -30 +30 @@
 BITS = 32
 PAGE_SIZE = 16384
-EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
-
-RD_SRVS_ESSENTIAL +=
+EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
 RD_SRVS_NON_ESSENTIAL += \

boot/arch/ppc32/Makefile.inc

@@ -43 +43 @@
         $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
 
-RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms
+RD_DRVS += \
+        infrastructure/rootmac
 
 SOURCES = \

boot/arch/sparc64/Makefile.inc

@@ -43 +43 @@
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hw/irc/fhc/fhc \
         $(USPACE_PATH)/srv/hw/irc/obio/obio
 

boot/arch/sparc64/src/main.c

@@ -182 +182 @@
          * of the "/memory" node to find out which parts of memory
          * are used by OBP and redesign the algorithm of copying
-         * kernel/init tasks/ramdisk from the bootable image to memory
-         * (which we must do anyway because of issues with claiming the memory
-         * on Serengeti).
-         *
+         * kernel/init tasks/ramdisk from the bootable image to memory.
          */
         bootinfo.physmem_start += OBP_BIAS;

boot/generic/src/version.c

@@ -32 +32 @@
 
 static const char *project = "HelenOS bootloader";
-static const char *copyright = "Copyright (c) 2001-2010 HelenOS project";
+static const char *copyright = "Copyright (c) 2001-2011 HelenOS project";
 static const char *release = STRING(RELEASE);
 static const char *name = STRING(NAME);