Changeset 3f03199 in mainline for boot

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:

boot

Files:

• Makefile.common (modified) (5 diffs)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/src/mm.c (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/sparc64/src/asm.S (modified) (3 diffs)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
+        $(USPACE_PATH)/srv/hid/rfb/rfb \
+        $(USPACE_PATH)/srv/net/dhcp/dhcp \
         $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \
@@ -165 +167 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/devctl/devctl \
         $(USPACE_PATH)/app/dltest/dltest \
@@ -171 +174 @@
         $(USPACE_PATH)/app/dnscfg/dnscfg \
         $(USPACE_PATH)/app/dnsres/dnsres \
+        $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/inet/inet \
@@ -194 +198 @@
         $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
+        $(USPACE_PATH)/app/netspeed/netspeed \
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
@@ -205 +210 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo
+        $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/df/df
 
 ifeq ($(CONFIG_PCC),y)

boot/arch/arm32/Makefile.inc

@@ -57 +57 @@
 endif
 
-RD_DRVS += \
+RD_DRVS_ESSENTIAL += \
         infrastructure/rootamdm37x \
         fb/amdm37x_dispc \

boot/arch/arm32/src/mm.c

@@ -207 +207 @@
                  * so this is safe for all archs.
                  * Enable VMSAv6 the bit (23) is only writable on ARMv6.
+                 * (and QEMU)
                  */
+#ifdef PROCESSOR_ARCH_armv6
                 "ldr r1, =0x00801805\n"
+#else
+                "ldr r1, =0x00001805\n"
+#endif
                 
                 "orr r0, r0, r1\n"

boot/arch/mips32/Makefile.inc

@@ -50 +50 @@
 endif
 
+ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
+        RD_DRVS_ESSENTIAL += \
+                infrastructure/rootmalta \
+                block/ata_bd \
+                bus/pci/pciintel \
+                bus/isa \
+                char/i8042 \
+                char/ps2mouse \
+                char/xtkbd
+
+        RD_DRV_CFG += \
+                bus/isa
+endif
 
 SOURCES = \

boot/arch/ppc32/Makefile.inc

@@ -42 +42 @@
         $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
 
-RD_DRVS += \
+RD_DRVS_ESSENTIAL += \
         infrastructure/rootmac \
         bus/pci/pciintel \

boot/arch/sparc64/src/asm.S

@@ -30 +30 @@
 #include <arch/arch.h>
 
+#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
 #define ICACHE_SIZE       8192
 #define ICACHE_LINE_SIZE  32
 #define ICACHE_SET_BIT    (1 << 13)
 #define ASI_ICACHE_TAG    0x67
+#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
 .register %g2, #scratch
@@ -134 +136 @@
 # Flush I-cache
 icache_flush:
+#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
         set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
         stxa %g0, [%g1] ASI_ICACHE_TAG
@@ -149 +152 @@
         
         nop
+#else
+        // TODO: sun4v
+        retl
+        nop
+#endif  /* PROCESSOR_us || PROCESSOR_us3 */
 
 .global ofw