Changeset 8e7c9fe in mainline for boot

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

boot

Files:

• Makefile.common (modified) (4 diffs)
• arch/amd64/Makefile.inc (modified) (3 diffs)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/src/main.c (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (2 diffs)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips64/Makefile.inc (deleted)
• arch/mips64/_link.ld.in (deleted)
• arch/mips64/include/arch.h (deleted)
• arch/mips64/include/asm.h (deleted)
• arch/mips64/include/main.h (deleted)
• arch/mips64/include/regname.h (deleted)
• arch/mips64/include/types.h (deleted)
• arch/mips64/src/asm.S (deleted)
• arch/mips64/src/main.c (deleted)
• arch/mips64/src/putchar.c (deleted)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• genarch/src/ofw.c (modified) (1 diff)

boot/Makefile.common

@@ -127 +127 @@
 
 RD_DRVS_ESSENTIAL = \
-        infrastructure/root
+        root/root \
+        root/virt \
+        fb/kfb 
 
 RD_DRVS_NON_ESSENTIAL = \
-        infrastructure/rootvirt \
-        fb/kfb \
         test/test1 \
         test/test2 \
@@ -138 +138 @@
         nic/e1k \
         nic/rtl8139 \
+        nic/rtl8169 \
         block/ahci
 
@@ -189 +190 @@
         $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/mkmfs/mkmfs \
+        $(USPACE_PATH)/app/nic/nic \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \
@@ -216 +218 @@
         $(USPACE_PATH)/app/vdemo/vdemo \
         $(USPACE_PATH)/app/viewer/viewer \
-        $(USPACE_PATH)/app/df/df
-
-ifeq ($(CONFIG_PCC),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/cc/cc \
-        $(USPACE_PATH)/app/ccom/ccom \
-        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
-        $(USPACE_PATH)/app/cpp/cpp
-endif
-
-ifeq ($(CONFIG_BINUTILS),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/binutils/bin/as \
-        $(USPACE_PATH)/app/binutils/bin/ld
-endif
-
-ifeq ($(CONFIG_MSIM),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/msim/msim
-endif
+        $(USPACE_PATH)/app/df/df \
+        $(USPACE_PATH)/app/fontviewer/fontviewer
 
 COMPONENTS = \

boot/arch/amd64/Makefile.inc

@@ -35 +35 @@
 
 RD_DRVS_ESSENTIAL += \
-        infrastructure/rootpc \
+        platform/pc \
         block/ata_bd \
         bus/pci/pciintel \
@@ -45 +45 @@
 
 RD_DRVS_NON_ESSENTIAL += \
+        audio/hdaudio \
         char/ns8250 \
         time/cmos-rtc \
@@ -63 +64 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/mixerctl/mixerctl \
-        $(USPACE_PATH)/app/wavplay/wavplay \
-        
+        $(USPACE_PATH)/app/wavplay/wavplay
+
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img

boot/arch/arm32/Makefile.inc

@@ -60 +60 @@
 
 ifeq ($(MACHINE), gta02)
-RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+                $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+endif
+
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
+        RD_DRVS_ESSENTIAL += \
+                platform/amdm37x \
+                fb/amdm37x_dispc
+endif
+
+ifeq ($(MACHINE), integratorcp)
+        RD_DRVS_ESSENTIAL += \
+                char/pl050 \
+                char/xtkbd \
+                char/ps2mouse \
+                platform/icp
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hw/irc/icp-ic/icp-ic
 endif
 
 RD_DRVS_ESSENTIAL += \
-        infrastructure/rootamdm37x \
-        fb/amdm37x_dispc \
         bus/usb/ehci \
         bus/usb/ohci \

boot/arch/arm32/src/main.c

@@ -129 +129 @@
         
         printf(".\n");
+
+        /* Flush PT too. We need this if we disable caches later */
+        clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE);
         
         printf("Booting the kernel...\n");

boot/arch/ia64/Makefile.inc

@@ -31 +31 @@
 BFD_ARCH = ia64
 
-#
-# FIXME:
-#
-# The -fno-selective-scheduling and -fno-selective-scheduling2 options
-# should be removed as soon as a bug in GCC concerning unchecked
-# speculative loads is fixed.
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
-#
-
 BITS = 64
 ENDIANESS = LE
-EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata -fno-selective-scheduling -fno-selective-scheduling2
+EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
 
 RD_SRVS_NON_ESSENTIAL +=
@@ -74 +64 @@
         arch/$(BARCH)/src/ski.c
 endif
+
+RD_DRVS_ESSENTIAL += \
+        platform/pc \
+        bus/pci/pciintel \
+        bus/isa \
+        char/i8042 \
+        char/xtkbd
+
+RD_DRVS_NON_ESSENTIAL += \
+        char/ns8250 \
+        time/cmos-rtc \
+        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/vhc
+
+RD_DRV_CFG += \
+        bus/isa
+

boot/arch/mips32/Makefile.inc

@@ -52 +52 @@
 ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
         RD_DRVS_ESSENTIAL += \
-                infrastructure/rootmalta \
+                platform/malta \
                 block/ata_bd \
                 bus/pci/pciintel \

boot/arch/ppc32/Makefile.inc

@@ -43 +43 @@
 
 RD_DRVS_ESSENTIAL += \
-        infrastructure/rootmac \
+        platform/mac \
         bus/pci/pciintel \
         bus/usb/ohci \

boot/genarch/src/ofw.c

@@ -377 +377 @@
             (map->cnt < MEMMAP_MAX_RECORDS); pos += ac + sc) {
                 void *start = (void *) (buf[pos + ac - 1]);
-                uint32_t size = buf[pos + ac + sc - 1];
+                uintptr_t size = buf[pos + ac + sc - 1];
                 
                 /*