Changes in / [6bb169b5:db96017] in mainline

Files:

• boot/arch/mips32/src/Makefile (modified) (2 diffs)
• boot/arch/mips32/src/Makefile.build (modified) (3 diffs)
• boot/arch/mips32/src/Makefile.toolchain (modified) (3 diffs)
• boot/grub.pc/stage2_eltorito (added)
• uspace/app/netstart/self_test.c (deleted)
• uspace/app/netstart/self_test.h (deleted)
• uspace/lib/c/Makefile.toolchain (added)
• uspace/lib/c/arch/amd64/include/limits.h (added)
• uspace/lib/c/arch/arm32/include/limits.h (added)
• uspace/lib/c/arch/ia32/include/limits.h (added)
• uspace/lib/c/arch/ia64/include/limits.h (added)
• uspace/lib/c/arch/mips32/include/limits.h (added)
• uspace/lib/c/arch/mips32eb/include/limits.h (added)
• uspace/lib/c/arch/ppc32/include/limits.h (added)
• uspace/lib/c/arch/sparc64/include/limits.h (added)
• uspace/lib/c/include/limits.h (added)
• uspace/lib/libpci/Makefile.build (added)
• uspace/lib/libpci/Makefile.common (added)
• uspace/lib/packet/include/net_byteorder.h (added)
• uspace/lib/packet/include/net_err.h (added)
• uspace/lib/packet/include/socket_errno.h (added)
• uspace/srv/hid/input/include/sun.h (added)
• uspace/srv/hid/input/port/dummy.c (added)
• uspace/srv/hid/input/port/sgcn.c (added)
• uspace/srv/hid/input/port/sun.c (added)
• uspace/srv/hid/input/port/z8530.c (added)
• uspace/srv/hid/kbd/port/i8042.h (added)
• uspace/srv/hw/netif/ne2000/dp8390_drv.h (added)
• uspace/srv/hw/netif/ne2000/dp8390_port.h (added)
• uspace/srv/hw/netif/ne2000/local.h (added)
• uspace/srv/hw/netif/ne2000/ne2000.h (added)

boot/arch/mips32/src/Makefile

@@ -32 +32 @@
 .PHONY: all clean
 
-all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
+all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        rm -f $(USPACEDIR)/dist/srv/*
-        rm -f $(USPACEDIR)/dist/app/*
-        rm -f $(USPACEDIR)/dist/cfg/net/*
-
         for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
@@ -47 +43 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        for file in $(NET_CFG) ; do \
-                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
-        done
         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(RAW) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
         find . -name '*.o' -follow -exec rm \{\} \;

boot/arch/mips32/src/Makefile.build

@@ -32 +32 @@
 
 include ../../../../version
-include ../../../../Makefile.common
 include ../../../../Makefile.config
+include ../../../../config.defs
 include Makefile.common
 include Makefile.toolchain
@@ -77 +77 @@
 
 $(DEPEND):
-        rm -f $(USPACEDIR)/dist/srv/*
-        rm -f $(USPACEDIR)/dist/app/*
-        rm -f $(USPACEDIR)/dist/cfg/net/*
-
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
@@ -86 +82 @@
         for file in $(RD_APPS) ; do \
                 cp $$file $(USPACEDIR)/dist/app/ ; \
-        done
-        for file in $(NET_CFG) ; do \
-                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
         done
 ifeq ($(RDFMT),tmpfs)

boot/arch/mips32/src/Makefile.toolchain

@@ -27 +27 @@
 #
 
+## Toolchain configuration
+#
+
+ifndef CROSS_PREFIX
+        CROSS_PREFIX = /usr/local
+endif
+
 BFD_ARCH = mips
+TARGET = mipsel-linux-gnu
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
 
 JOBFILE = ../../../../tools/jobfile.py
@@ -39 +48 @@
         BFD_NAME = elf32-tradbigmips
         BFD = ecoff-bigmips
+        TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32eb/bin
+        TARGET = mips-linux-gnu
 endif
 
@@ -44 +55 @@
         BFD_NAME = elf32-tradlittlemips
         BFD = binary
+endif
+
+ifeq ($(COMPILER),gcc_native)
+        CC = gcc
+        AS = as
+        LD = ld
+        OBJCOPY = objcopy
+        OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
+        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
+        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
+        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
+        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
+        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif