Changeset bee37cf in mainline for boot/arch

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/arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• mips32/Makefile.inc (modified) (1 diff)
• mips64/Makefile.inc (added)
• mips64/_link.ld.in (added)
• mips64/include/arch.h (added)
• mips64/include/asm.h (added)
• mips64/include/main.h (added)
• mips64/include/regname.h (added)
• mips64/include/types.h (added)
• mips64/src/asm.S (added)
• mips64/src/main.c (added)
• mips64/src/putchar.c (added)
• ppc32/Makefile.inc (modified) (1 diff)
• sparc64/Makefile.inc (modified) (1 diff)
• sparc64/src/main.c (modified) (1 diff)

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;