Changeset 4c14b88 in mainline for boot

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

Location:

boot

Files:

• Makefile (modified) (2 diffs)
• Makefile.build (modified) (1 diff)
• Makefile.common (modified) (5 diffs)
• arch/sparc32/Makefile.inc (added)
• arch/sparc32/_link.ld.in (added)
• arch/sparc32/include/ambapp.h (added)
• arch/sparc32/include/arch.h (added)
• arch/sparc32/include/asm.h (added)
• arch/sparc32/include/main.h (added)
• arch/sparc32/include/mm.h (added)
• arch/sparc32/include/types.h (added)
• arch/sparc32/src/ambapp.c (added)
• arch/sparc32/src/asm.S (added)
• arch/sparc32/src/main.c (added)
• arch/sparc32/src/mm.c (added)
• arch/sparc32/src/putchar.c (added)

boot/Makefile

@@ -80 +80 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
+        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
+                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
+        fi
 
 clean: clean_dist
@@ -94 +97 @@
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
-        rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/lib/*
         rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*

boot/Makefile.build

@@ -75 +75 @@
 endif
 
+ifeq ($(COMPILER),gcc_helenos)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
+
 ifeq ($(COMPILER),icc)
         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)

boot/Makefile.common

@@ -48 +48 @@
 USPACE_PATH = $(ROOT_PATH)/uspace
 DIST_PATH = $(USPACE_PATH)/dist
+DIST_OVERLAY_PATH = $(USPACE_PATH)/overlay
 TOOLS_PATH = $(ROOT_PATH)/tools
 DRVS_PATH = drv
@@ -118 +119 @@
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
+        $(USPACE_PATH)/srv/net/nconfsrv/nconfsrv \
         $(USPACE_PATH)/srv/net/slip/slip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
@@ -176 +178 @@
         $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/hdisk/hdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
@@ -201 +204 @@
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
-        $(USPACE_PATH)/app/ping6/ping6 \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/untar/untar \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/vuhid/vuh \
@@ -211 +214 @@
         $(USPACE_PATH)/app/date/date \
         $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/viewer/viewer \
         $(USPACE_PATH)/app/df/df