Changeset 8013637 in mainline for boot

Timestamp:

2012-07-20T13:51:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

Location:

boot

Files:

• Makefile.build (modified) (3 diffs)
• Makefile.common (modified) (7 diffs)
• Makefile.grub (modified) (1 diff)

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/bd/sata_bd/sata_bd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -107 +108 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/net/ethip/ethip \
-        $(USPACE_PATH)/srv/net/inet/inet \
+        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
@@ -122 +123 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139
+        nic/rtl8139 \
+        block/ahci
 
 RD_DRV_CFG =
@@ -157 +159 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
-        $(USPACE_PATH)/app/inetcfg/inetcfg \
+        $(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 \
@@ -177 +179 @@
         $(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 \
@@ -200 +203 @@
 endif
 
+ifeq ($(CONFIG_MSIM),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/msim/msim
+endif
+
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \

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)