Changeset 97c7682 in mainline for boot

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

Location:

boot

Files:

• Makefile (modified) (1 diff)
• Makefile.build (modified) (3 diffs)
• Makefile.common (modified) (7 diffs)
• Makefile.grub (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• generic/src/printf_core.c (modified) (1 diff)

boot/Makefile

@@ -66 +66 @@
                 cp "$$file" "$(DIST_PATH)/app/" ; \
         done
-        for file in $(NET_CFG) ; do \
-                cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
-        done
         for drv in $(RD_DRVS) ; do \
                 drv_dir="`dirname "$$drv"`" ; \

boot/Makefile.build

@@ -47 +47 @@
         -Werror-implicit-function-declaration -wd170
 
-SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
-        -xnolib -xc99=all -features=extensions \
-        -erroff=E_ZERO_SIZED_STRUCT_UNION
-
 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
@@ -66 +62 @@
         GCC_CFLAGS += -g
         ICC_CFLAGS += -g
-        SUNCC_CFLAGS += -g
         CLANG_CFLAGS += -g
 endif
@@ -83 +78 @@
         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),suncc)
-        CFLAGS = $(SUNCC_CFLAGS) $(EXTRA_CFLAGS)
-        DEFS += $(CONFIG_DEFS)
-        DEPEND_DEFS = $(DEFS)
 endif
 

boot/Makefile.common

@@ -72 +72 @@
         $(USPACE_PATH)/srv/loader/loader \
         $(USPACE_PATH)/app/init/init \
-        $(USPACE_PATH)/srv/loc/loc \
+        $(USPACE_PATH)/srv/locsrv/locsrv \
         $(USPACE_PATH)/srv/bd/rd/rd \
         $(USPACE_PATH)/srv/vfs/vfs
@@ -98 +98 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
-        $(USPACE_PATH)/srv/clip/clip \
+        $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
@@ -106 +106 @@
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
+        $(USPACE_PATH)/srv/net/ethip/ethip \
+        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
+        $(USPACE_PATH)/srv/net/loopip/loopip \
+        $(USPACE_PATH)/srv/net/tcp/tcp \
+        $(USPACE_PATH)/srv/net/udp/udp \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/net/nil/eth/eth \
-        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
-        $(USPACE_PATH)/srv/net/il/arp/arp \
-        $(USPACE_PATH)/srv/net/il/ip/ip \
-        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
-        $(USPACE_PATH)/srv/net/tl/udp/udp \
-        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
-        $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
 
@@ -123 +120 @@
         test/test2 \
         test/test3 \
-        nic/lo \
         nic/ne2k \
         nic/e1k \
@@ -161 +157 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
+        $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
-        $(USPACE_PATH)/app/locinfo/locinfo \
+        $(USPACE_PATH)/app/loc/loc \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \
@@ -180 +177 @@
         $(USPACE_PATH)/app/nettest3/nettest3 \
         $(USPACE_PATH)/app/netecho/netecho \
+        $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
@@ -203 +201 @@
 endif
 
-ifneq ($(CONFIG_BAREBONE),y)
-NET_CFG = \
-        $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo.nic \
-        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
-        $(USPACE_PATH)/srv/net/cfg/e1k.nic
+ifeq ($(CONFIG_MSIM),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/msim/msim
 endif
 

boot/Makefile.grub

@@ -60 +60 @@
 build_dist: clean
         mkdir -p $(BOOT)
-        cp -r $(GRUB) $(BOOT)/grub
+        cp -r -L $(GRUB) $(BOOT)/grub
 ifeq ($(GRUB_ARCH),efi)
         gunzip $(IMAGE)

boot/arch/arm32/Makefile.inc

@@ -53 +53 @@
 ifeq ($(MACHINE), gta02)
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
 endif
 

boot/generic/src/printf_core.c

@@ -210 +210 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;