Changeset beb9336 in mainline for boot

Timestamp:

2012-08-24T14:07:52Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (7 diffs)
• arch/mips32/Makefile.inc (modified) (2 diffs)
• arch/mips64/Makefile.inc (modified) (2 diffs)
• generic/include/printf.h (modified) (1 diff)
• generic/include/printf_verify.h (added)
• generic/src/str.c (modified) (1 diff)

boot/Makefile

@@ -47 +47 @@
         $(MKFAT) 1048576 $(DIST_PATH) $@
 endif
-ifeq ($(RDFMT),ext2fs)
-        $(MKEXT2) 1048576 $(DIST_PATH) $@
+ifeq ($(RDFMT),ext4fs)
+        $(MKEXT4) 1048576 $(DIST_PATH) $@
 endif
 

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT2 = $(TOOLS_PATH)/mkext2.py
+MKEXT4 = $(TOOLS_PATH)/mkext4.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -74 +74 @@
         $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs \
-        
-# TODO: For comfort ext4fs debugging - delete before merge
-INIT_TASKS += $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
+        $(USPACE_PATH)/srv/vfs/vfs
 
 ifeq ($(RDFMT),tmpfs)
@@ -87 +84 @@
 endif
 
-ifeq ($(RDFMT),ext2fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
+ifeq ($(RDFMT),ext4fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
 endif
 
 RD_SRVS_ESSENTIAL = \
-        $(USPACE_PATH)/srv/hid/fb/fb \
         $(USPACE_PATH)/srv/hid/input/input \
+        $(USPACE_PATH)/srv/hid/output/output \
         $(USPACE_PATH)/srv/hid/console/console \
-        $(USPACE_PATH)/srv/fs/locfs/locfs
+        $(USPACE_PATH)/srv/devman/devman \
+        $(USPACE_PATH)/srv/fs/locfs/locfs \
+        $(USPACE_PATH)/srv/hid/compositor/compositor
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -111 +110 @@
         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
+        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -116 +116 @@
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
-        $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/devman/devman
+        $(USPACE_PATH)/srv/taskmon/taskmon
 
 RD_DRVS = \
         infrastructure/root \
         infrastructure/rootvirt \
+        fb/kfb \
         test/test1 \
         test/test2 \
@@ -152 +152 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog
+        $(USPACE_PATH)/app/klog/klog \
+        $(USPACE_PATH)/app/vlaunch/vlaunch \
+        $(USPACE_PATH)/app/vterm/vterm
 
 RD_APPS_NON_ESSENTIAL = \
@@ -192 +194 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/websrv/websrv
+        $(USPACE_PATH)/app/websrv/websrv \
+        $(USPACE_PATH)/app/vdemo/vdemo
 
 ifeq ($(CONFIG_PCC),y)

boot/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BITS = 32
-EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
+EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
 RD_SRVS_NON_ESSENTIAL += \
@@ -48 +48 @@
         BFD_OUTPUT = binary
         ENDIANESS = LE
-        EXTRA_GCC_CFLAGS = -mhard-float
 endif
 

boot/arch/mips64/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips:4000
 BITS = 64
-EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
+EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
 
 ifeq ($(MACHINE),msim)
@@ -35 +35 @@
         BFD_OUTPUT = binary
         ENDIANESS = LE
-        EXTRA_GCC_CFLAGS = -mhard-float
 endif
 

boot/generic/include/printf.h

@@ -35 +35 @@
 #include <typedefs.h>
 #include <stdarg.h>
-
-#ifndef NVERIFY_PRINTF
-
-#define PRINTF_ATTRIBUTE(start, end) \
-        __attribute__((format(gnu_printf, start, end)))
-
-#else /* NVERIFY_PRINTF */
-
-#define PRINTF_ATTRIBUTE(start, end)
-
-#endif /* NVERIFY_PRINTF */
+#include <printf_verify.h>
 
 #define EOF  (-1)

boot/generic/src/str.c

@@ -357 +357 @@
  * and both strings consist of the same sequence of characters.
  *
- * A string is smaller than another string iff it is shorter or
- * has a character with lower value at the first position where
- * the strings differ.
+ * A string S1 is less than another string S2 if it has a character with
+ * lower value at the first character position where the strings differ.
+ * If the strings differ in length, the shorter one is treated as if
+ * padded by characters with a value of zero.
  *
  * @param s1 First string to compare.
  * @param s2 Second string to compare.
  *
- * @return 0 if the strings are equal, -1 if first is smaller,
- *         1 if second smaller.
+ * @return 0 if the strings are equal, -1 if the first is less than the second,
+ *         1 if the second is less than the first.
  *
  */