Changeset 7719958 in mainline for boot

Timestamp:

2012-04-23T22:51:36Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6a3808e

Parents:

3293a94 (diff), 32fef47 (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

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (5 diffs)
• 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.common

@@ -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/inet/inet \
+        $(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/inetcfg/inetcfg \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
@@ -204 +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
-endif
-
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \

boot/arch/arm32/Makefile.inc

@@ -42 +42 @@
 
 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
 
 RD_SRVS_NON_ESSENTIAL += \

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;