diff --git a/sys/pic32/Makefile b/sys/pic32/Makefile
index 18049c8..1ee6825 100644
--- a/sys/pic32/Makefile
+++ b/sys/pic32/Makefile
@@ -14,9 +14,12 @@ install:
 
 clean:
 		-for i in $(SUBDIR); do ${MAKE} -C $$i clean; done
-		find .. -name \*~ | xargs rm -f
 
 reconfig:
+		-for i in $(SUBDIR); do ${MAKE} -C $$i reconfig; done
+
+configsys:
 		-for i in $(SUBDIR); do echo $$i; \
                 I=`echo $$i | awk '{print toupper($$0)}'`; \
-                (cd $$i; ../../../tools/configsys/config $$I); done
+                if [ ! -f $$i/Config ]; then \
+                (cd $$i; ../../../tools/configsys/config $$I); fi; done
diff --git a/sys/pic32/Makefile.kconf b/sys/pic32/Makefile.kconf
index a3c9388..6cac4fe 100644
--- a/sys/pic32/Makefile.kconf
+++ b/sys/pic32/Makefile.kconf
@@ -56,10 +56,10 @@ SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
 %LOAD
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
diff --git a/sys/pic32/duinomite-emega/Config b/sys/pic32/duinomite-emega/Config
index 0f7cd34..4a76473 100644
--- a/sys/pic32/duinomite-emega/Config
+++ b/sys/pic32/duinomite-emega/Config
@@ -6,7 +6,7 @@
 # For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-Olimex-Duinomite
 #
 # To build the kernel, use:
-#   cd sys/pic32/duinomite-e
+#   cd sys/pic32/duinomite-emega
 #   kconfig Config
 #   make clean
 #   make
diff --git a/sys/pic32/duinomite-emega/Config-uart b/sys/pic32/duinomite-emega/Config-uart
index 34a1709..cee16b2 100644
--- a/sys/pic32/duinomite-emega/Config-uart
+++ b/sys/pic32/duinomite-emega/Config-uart
@@ -6,8 +6,8 @@
 # For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-Olimex-Duinomite
 #
 # To build the kernel, use:
-#   cd sys/pic32/duinomite-e
-#   kconfig Config
+#   cd sys/pic32/duinomite-emega
+#   kconfig Config-uart
 #   make clean
 #   make
 #
diff --git a/sys/pic32/duinomite-emega/Makefile b/sys/pic32/duinomite-emega/Makefile
index 02006c2..71cac18 100644
--- a/sys/pic32/duinomite-emega/Makefile
+++ b/sys/pic32/duinomite-emega/Makefile
@@ -126,10 +126,10 @@ swapunix.o: swapunix.c
 all: unix.elf
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
diff --git a/sys/pic32/duinomite/Config-uart b/sys/pic32/duinomite/Config-uart
index f1f3848..0940452 100644
--- a/sys/pic32/duinomite/Config-uart
+++ b/sys/pic32/duinomite/Config-uart
@@ -6,7 +6,7 @@
 #
 # To build the kernel, use:
 #   cd sys/pic32/duinomite
-#   kconfig Config
+#   kconfig Config-uart
 #   make clean
 #   make
 #
diff --git a/sys/pic32/duinomite/Makefile b/sys/pic32/duinomite/Makefile
index fc7c1f3..52ca9e5 100644
--- a/sys/pic32/duinomite/Makefile
+++ b/sys/pic32/duinomite/Makefile
@@ -126,10 +126,10 @@ swapunix.o: swapunix.c
 all: unix.elf
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
diff --git a/sys/pic32/max32/Makefile b/sys/pic32/max32/Makefile
index 5e6086c..7266668 100644
--- a/sys/pic32/max32/Makefile
+++ b/sys/pic32/max32/Makefile
@@ -122,10 +122,10 @@ swapunix.o: swapunix.c
 all: unix.elf
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
diff --git a/sys/pic32/picadillo/Config-rambo b/sys/pic32/picadillo/Config-rambo
index 65331e0..0002a6b 100644
--- a/sys/pic32/picadillo/Config-rambo
+++ b/sys/pic32/picadillo/Config-rambo
@@ -6,7 +6,7 @@
 #
 # To build the kernel, use:
 #   cd sys/pic32/picadillo
-#   kconfig Config
+#   kconfig Config-rambo
 #   make clean
 #   make
 #
diff --git a/sys/pic32/picadillo/Makefile b/sys/pic32/picadillo/Makefile
index 1f9fd3e..bdf929e 100644
--- a/sys/pic32/picadillo/Makefile
+++ b/sys/pic32/picadillo/Makefile
@@ -119,10 +119,10 @@ swapunix.o: swapunix.c
 all: unix.elf
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config
diff --git a/sys/pic32/ubw32/.gitignore b/sys/pic32/ubw32/.gitignore
index 6a22af6..7e25ca8 100644
--- a/sys/pic32/ubw32/.gitignore
+++ b/sys/pic32/ubw32/.gitignore
@@ -7,3 +7,6 @@ unix.bin
 unix.map
 usbboot.map
 vers.c
+*.h
+ioconf.c
+swapunix.c
diff --git a/sys/pic32/ubw32/Config b/sys/pic32/ubw32/Config
new file mode 100644
index 0000000..c0816f5
--- /dev/null
+++ b/sys/pic32/ubw32/Config
@@ -0,0 +1,80 @@
+#
+# UBW32 board with two SD card slots
+# ==================================
+# For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-Sparkfun-UBW32
+# Console on USB.
+# For Windows, use the driver: http://www.schmalzhaus.com/UBW32/FW/UBW32inf.zip
+#
+# To build the kernel, use:
+#   cd sys/pic32/ubw32
+#   kconfig Config
+#   make clean
+#   make
+#
+# Format of this file is described on page:
+# http://retrobsd.org/wiki/doku.php/doc/kconfig
+#
+architecture    "pic32"
+cpu             "PIC32MX7"                  # Processor variant
+board           "UBW32"                     # Board type
+hz              100                         # Rate of clock interrupt
+ldscript        "cfg/bootloader-ubw32.ld"   # Linker script
+
+# Standard system options
+options         "CPU_KHZ=80000"             # Oscillator frequency of CPU core
+options         "BUS_KHZ=80000"             # Frequency of peripheral bus
+options         "BUS_DIV=1"                 # Bus clock divisor 1/2/4/8
+
+# LED
+options         "LED_KERNEL_PORT=TRISE"     # for kernel activity LED...
+options         "LED_KERNEL_PIN=2"          # ...use pin RE2
+options         "LED_KERNEL_INVERT"
+options         "LED_DISK_PORT=TRISE"       # for disk activity LED...
+options         "LED_DISK_PIN=1"            # ...use pin RE1
+options         "LED_DISK_INVERT"
+options         "LED_SWAP_PORT=TRISE"       # for swap activity LED...
+options         "LED_SWAP_PIN=0"            # ...use pin RE0
+options         "LED_SWAP_INVERT"
+options         "LED_TTY_PORT=TRISE"        # for console activity LED...
+options         "LED_TTY_PIN=3"             # ...use pin RE3
+options         "LED_TTY_INVERT"
+
+# Root filesystem at /dev/sd0a, swap at /dev/sd0b
+config          unix    root on sd0a
+                        swap on sd0b
+                        dumps on sd0b
+
+# Console options
+options         "CONSOLE_DEVICE=ttyUSB0"    # Console on USB
+
+# Virtual UART on USB
+pseudo-device   uartusb
+options         "UARTUSB_ENABLED"           # TODO: delete this option
+options         "USB_MAX_EP_NUMBER=3"
+options         "USB_NUM_STRING_DESCRIPTORS=3"
+
+# SPI ports
+controller      spi1                        # SD card
+options         "SPI_ENABLED"               # TODO: delete this option
+
+# microSD card
+disk            sd0     at spi1 flags 0x19  # select pin RA9
+disk            sd1     at spi1 flags 0x1a  # select pin RA10
+options         "SD0_PORT=1"                # sd0 at spi1           TODO: delete
+options         "SD0_CS_PORT=TRISA"         # for sd0 chip select...TODO: use flags
+options         "SD0_CS_PIN=9"              # ...use pin RA9        TODO: use flags
+options         "SD1_PORT=1"                # sd1 at spi1           TODO: delete
+options         "SD1_CS_PORT=TRISA"         # for sd1 chip select...TODO: use flags
+options         "SD1_CS_PIN=10"             # ...use pin RA9        TODO: use flags
+
+# General purpose I/O ports
+device          gpio0
+options         "GPIO_ENABLED"              # TODO: delete this option
+
+# ADC driver
+device          adc0
+options         "ADC_ENABLED"               # TODO: delete this option
+
+# PWM driver
+device          pwm0
+options         "PWM_ENABLED"               # TODO: delete this option
diff --git a/sys/pic32/ubw32/Config-uart b/sys/pic32/ubw32/Config-uart
new file mode 100644
index 0000000..bc6d16c
--- /dev/null
+++ b/sys/pic32/ubw32/Config-uart
@@ -0,0 +1,77 @@
+#
+# UBW32 board with two SD card slots
+# ==================================
+# For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-Sparkfun-UBW32
+# Console on UART2.
+#
+# To build the kernel, use:
+#   cd sys/pic32/ubw32
+#   kconfig Config-uart
+#   make clean
+#   make
+#
+# Format of this file is described on page:
+# http://retrobsd.org/wiki/doku.php/doc/kconfig
+#
+architecture    "pic32"
+cpu             "PIC32MX7"                  # Processor variant
+board           "UBW32"                     # Board type
+hz              100                         # Rate of clock interrupt
+ldscript        "cfg/bootloader-ubw32.ld"   # Linker script
+
+# Standard system options
+options         "CPU_KHZ=80000"             # Oscillator frequency of CPU core
+options         "BUS_KHZ=80000"             # Frequency of peripheral bus
+options         "BUS_DIV=1"                 # Bus clock divisor 1/2/4/8
+
+# LED
+options         "LED_KERNEL_PORT=TRISE"     # for kernel activity LED...
+options         "LED_KERNEL_PIN=2"          # ...use pin RE2
+options         "LED_KERNEL_INVERT"
+options         "LED_DISK_PORT=TRISE"       # for disk activity LED...
+options         "LED_DISK_PIN=1"            # ...use pin RE1
+options         "LED_DISK_INVERT"
+options         "LED_SWAP_PORT=TRISE"       # for swap activity LED...
+options         "LED_SWAP_PIN=0"            # ...use pin RE0
+options         "LED_SWAP_INVERT"
+options         "LED_TTY_PORT=TRISE"        # for console activity LED...
+options         "LED_TTY_PIN=3"             # ...use pin RE3
+options         "LED_TTY_INVERT"
+
+# Root filesystem at /dev/sd0a, swap at /dev/sd0b
+config          unix    root on sd0a
+                        swap on sd0b
+                        dumps on sd0b
+
+# Console options
+options         "CONSOLE_DEVICE=tty1"       # Console on UART2
+
+# Serial UART ports
+device          uart2                       # USB-to-serial adapter
+options         "UART2_ENABLED"             # TODO: delete this option
+
+# SPI ports
+controller      spi1                        # SD card
+options         "SPI_ENABLED"               # TODO: delete this option
+
+# microSD card
+disk            sd0     at spi1 flags 0x19  # select pin RA9
+disk            sd1     at spi1 flags 0x1a  # select pin RA10
+options         "SD0_PORT=1"                # sd0 at spi1           TODO: delete
+options         "SD0_CS_PORT=TRISA"         # for sd0 chip select...TODO: use flags
+options         "SD0_CS_PIN=9"              # ...use pin RA9        TODO: use flags
+options         "SD1_PORT=1"                # sd1 at spi1           TODO: delete
+options         "SD1_CS_PORT=TRISA"         # for sd1 chip select...TODO: use flags
+options         "SD1_CS_PIN=10"             # ...use pin RA9        TODO: use flags
+
+# General purpose I/O ports
+device          gpio0
+options         "GPIO_ENABLED"              # TODO: delete this option
+
+# ADC driver
+device          adc0
+options         "ADC_ENABLED"               # TODO: delete this option
+
+# PWM driver
+device          pwm0
+options         "PWM_ENABLED"               # TODO: delete this option
diff --git a/sys/pic32/ubw32/Makefile b/sys/pic32/ubw32/Makefile
new file mode 100644
index 0000000..924c12d
--- /dev/null
+++ b/sys/pic32/ubw32/Makefile
@@ -0,0 +1,369 @@
+PARAM = -DUBW32
+PARAM += -DPIC32MX7
+PARAM += -DPWM_ENABLED
+PARAM += -DADC_ENABLED
+PARAM += -DGPIO_ENABLED
+PARAM += -DSD1_CS_PIN=10
+PARAM += -DSD1_CS_PORT=TRISA
+PARAM += -DSD1_PORT=1
+PARAM += -DSD0_CS_PIN=9
+PARAM += -DSD0_CS_PORT=TRISA
+PARAM += -DSD0_PORT=1
+PARAM += -DSPI_ENABLED
+PARAM += -DUSB_NUM_STRING_DESCRIPTORS=3
+PARAM += -DUSB_MAX_EP_NUMBER=3
+PARAM += -DUARTUSB_ENABLED
+PARAM += -DCONSOLE_DEVICE=ttyUSB0
+PARAM += -DLED_TTY_INVERT
+PARAM += -DLED_TTY_PIN=3
+PARAM += -DLED_TTY_PORT=TRISE
+PARAM += -DLED_SWAP_INVERT
+PARAM += -DLED_SWAP_PIN=0
+PARAM += -DLED_SWAP_PORT=TRISE
+PARAM += -DLED_DISK_INVERT
+PARAM += -DLED_DISK_PIN=1
+PARAM += -DLED_DISK_PORT=TRISE
+PARAM += -DLED_KERNEL_INVERT
+PARAM += -DLED_KERNEL_PIN=2
+PARAM += -DLED_KERNEL_PORT=TRISE
+PARAM += -DBUS_DIV=1
+PARAM += -DBUS_KHZ=80000
+PARAM += -DCPU_KHZ=80000
+PARAM += -DHZ=100
+LDSCRIPT = "cfg/bootloader-ubw32.ld"
+#
+# Makefile for RetroBSD, pic32 target
+#
+# DEBUG is set to -g by kconfig if debugging is requested (kconfig -g).
+#
+include ../gcc-config.mk
+
+AS              = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
+CC              = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall
+CPP             = ${MIPS_GCC_PREFIX}cpp
+LD              = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
+LDFLAGS         = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map
+SIZE            = ${MIPS_GCC_PREFIX}size
+OBJCOPY         = ${MIPS_GCC_PREFIX}objcopy
+OBJDUMP         = ${MIPS_GCC_PREFIX}objdump
+
+ifneq (${MIPS_GCC_FORMAT},)
+    LDFLAGS     += -Wl,--oformat=${MIPS_GCC_FORMAT}
+endif
+
+# sources are located via $S relative to the compilation directory
+S               = ../..
+
+DEPFLAGS	= -MT $@ -MP -MD -MF .deps/$*.dep
+DEFS            = -I. ${PARAM} -DKERNEL $(DEPFLAGS)
+CFLAGS          = -O ${DEFS}
+
+# compile rules: rules are named COMPILE_${SUFFIX}
+# SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
+
+COMPILE_C       = ${CC} -c ${CFLAGS} $<
+COMPILE_S       = ${CC} -c ${DEFS} $<
+
+OBJS = exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o \
+	init_main.o init_sysent.o kern_clock.o kern_descrip.o \
+	kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o \
+	kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o \
+	kern_subr.o kern_synch.o kern_sysctl.o kern_time.o rdisk.o \
+	subr_prf.o subr_rmap.o sys_generic.o sys_inode.o sys_pipe.o \
+	sys_process.o syscalls.o tty.o tty_subr.o tty_tty.o ufs_alloc.o \
+	ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \
+	ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o \
+	ufs_syscalls2.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o adc.o \
+	clock.o cons.o devsw.o exception.o gpio.o machdep.o mem.o pwm.o \
+	rd_sd.o signal.o spi.o spi_bus.o swap.o sysctl.o usb_device.o \
+	usb_function_cdc.o usb_uart.o 
+
+CFILES = $S/kernel/exec_aout.c $S/kernel/exec_conf.c $S/kernel/exec_elf.c \
+	$S/kernel/exec_script.c $S/kernel/exec_subr.c \
+	$S/kernel/init_main.c $S/kernel/init_sysent.c \
+	$S/kernel/kern_clock.c $S/kernel/kern_descrip.c \
+	$S/kernel/kern_exec.c $S/kernel/kern_exit.c \
+	$S/kernel/kern_fork.c $S/kernel/kern_mman.c \
+	$S/kernel/kern_proc.c $S/kernel/kern_prot.c \
+	$S/kernel/kern_prot2.c $S/kernel/kern_resource.c \
+	$S/kernel/kern_sig.c $S/kernel/kern_sig2.c $S/kernel/kern_subr.c \
+	$S/kernel/kern_synch.c $S/kernel/kern_sysctl.c \
+	$S/kernel/kern_time.c $S/kernel/rdisk.c $S/kernel/subr_prf.c \
+	$S/kernel/subr_rmap.c $S/kernel/sys_generic.c \
+	$S/kernel/sys_inode.c $S/kernel/sys_pipe.c \
+	$S/kernel/sys_process.c $S/kernel/syscalls.c $S/kernel/tty.c \
+	$S/kernel/tty_subr.c $S/kernel/tty_tty.c $S/kernel/ufs_alloc.c \
+	$S/kernel/ufs_bio.c $S/kernel/ufs_bmap.c $S/kernel/ufs_dsort.c \
+	$S/kernel/ufs_fio.c $S/kernel/ufs_inode.c $S/kernel/ufs_mount.c \
+	$S/kernel/ufs_namei.c $S/kernel/ufs_subr.c \
+	$S/kernel/ufs_syscalls.c $S/kernel/ufs_syscalls2.c \
+	$S/kernel/vfs_vnops.c $S/kernel/vm_sched.c $S/kernel/vm_swap.c \
+	$S/kernel/vm_swp.c $S/pic32/adc.c $S/pic32/clock.c \
+	$S/pic32/cons.c $S/pic32/devsw.c $S/pic32/exception.c \
+	$S/pic32/gpio.c $S/pic32/machdep.c $S/pic32/mem.c $S/pic32/pwm.c \
+	$S/pic32/rd_sd.c $S/pic32/signal.c $S/pic32/spi.c \
+	$S/pic32/spi_bus.c $S/pic32/swap.c $S/pic32/sysctl.c \
+	$S/pic32/usb_device.c $S/pic32/usb_function_cdc.c \
+	$S/pic32/usb_uart.c swapunix.c 
+
+# load lines for config "xxx" will be emitted as:
+# xxx: ${SYSTEM_DEP} swapxxx.o
+#	${SYSTEM_LD_HEAD}
+#	${SYSTEM_LD} swapxxx.o
+#	${SYSTEM_LD_TAIL}
+SYSTEM_OBJ      = startup.o ${OBJS} #ioconf.o
+ifeq (devcfg.c,$(wildcard devcfg.c))
+    SYSTEM_OBJ  += devcfg.o
+endif
+SYSTEM_DEP      = Makefile ioconf.c swapunix.c machine sys .deps ${SYSTEM_OBJ}
+SYSTEM_LD_HEAD  = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@
+SYSTEM_LD       = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \
+                  ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf
+SYSTEM_LD_TAIL  = ${SIZE} unix.elf; \
+                  $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \
+                  $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \
+                  $(OBJDUMP) -d -S unix.elf > unix.dis
+
+unix.elf: ${SYSTEM_DEP} swapunix.o
+	${SYSTEM_LD_HEAD}
+	${SYSTEM_LD} swapunix.o
+	${SYSTEM_LD_TAIL}
+
+swapunix.o: swapunix.c
+	${COMPILE_C}
+
+all: unix.elf
+
+clean:
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
+
+clean-all: clean
+	rm -f *.h ioconf.c swapunix.c vers.c
+
+reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
+	../../../tools/kconfig/kconfig Config
+	$(MAKE) clean
+
+load:   unix.elf
+	pic32prog unix.hex
+
+machine:
+	ln -s .. $@
+
+sys:
+	ln -s ../../include $@
+
+.deps:
+	mkdir .deps
+
+startup.o: ../startup.S
+	${COMPILE_S}
+
+ioconf.o: ioconf.c
+	${COMPILE_C}
+
+exec_aout.o: $S/kernel/exec_aout.c
+	${COMPILE_C}
+
+exec_conf.o: $S/kernel/exec_conf.c
+	${COMPILE_C}
+
+exec_elf.o: $S/kernel/exec_elf.c
+	${COMPILE_C}
+
+exec_script.o: $S/kernel/exec_script.c
+	${COMPILE_C}
+
+exec_subr.o: $S/kernel/exec_subr.c
+	${COMPILE_C}
+
+init_main.o: $S/kernel/init_main.c
+	${COMPILE_C}
+
+init_sysent.o: $S/kernel/init_sysent.c
+	${COMPILE_C}
+
+kern_clock.o: $S/kernel/kern_clock.c
+	${COMPILE_C}
+
+kern_descrip.o: $S/kernel/kern_descrip.c
+	${COMPILE_C}
+
+kern_exec.o: $S/kernel/kern_exec.c
+	${COMPILE_C}
+
+kern_exit.o: $S/kernel/kern_exit.c
+	${COMPILE_C}
+
+kern_fork.o: $S/kernel/kern_fork.c
+	${COMPILE_C}
+
+kern_mman.o: $S/kernel/kern_mman.c
+	${COMPILE_C}
+
+kern_proc.o: $S/kernel/kern_proc.c
+	${COMPILE_C}
+
+kern_prot.o: $S/kernel/kern_prot.c
+	${COMPILE_C}
+
+kern_prot2.o: $S/kernel/kern_prot2.c
+	${COMPILE_C}
+
+kern_resource.o: $S/kernel/kern_resource.c
+	${COMPILE_C}
+
+kern_sig.o: $S/kernel/kern_sig.c
+	${COMPILE_C}
+
+kern_sig2.o: $S/kernel/kern_sig2.c
+	${COMPILE_C}
+
+kern_subr.o: $S/kernel/kern_subr.c
+	${COMPILE_C}
+
+kern_synch.o: $S/kernel/kern_synch.c
+	${COMPILE_C}
+
+kern_sysctl.o: $S/kernel/kern_sysctl.c
+	${COMPILE_C}
+
+kern_time.o: $S/kernel/kern_time.c
+	${COMPILE_C}
+
+rdisk.o: $S/kernel/rdisk.c
+	${COMPILE_C}
+
+subr_prf.o: $S/kernel/subr_prf.c
+	${COMPILE_C}
+
+subr_rmap.o: $S/kernel/subr_rmap.c
+	${COMPILE_C}
+
+sys_generic.o: $S/kernel/sys_generic.c
+	${COMPILE_C}
+
+sys_inode.o: $S/kernel/sys_inode.c
+	${COMPILE_C}
+
+sys_pipe.o: $S/kernel/sys_pipe.c
+	${COMPILE_C}
+
+sys_process.o: $S/kernel/sys_process.c
+	${COMPILE_C}
+
+syscalls.o: $S/kernel/syscalls.c
+	${COMPILE_C}
+
+tty.o: $S/kernel/tty.c
+	${COMPILE_C}
+
+tty_subr.o: $S/kernel/tty_subr.c
+	${COMPILE_C}
+
+tty_tty.o: $S/kernel/tty_tty.c
+	${COMPILE_C}
+
+ufs_alloc.o: $S/kernel/ufs_alloc.c
+	${COMPILE_C}
+
+ufs_bio.o: $S/kernel/ufs_bio.c
+	${COMPILE_C}
+
+ufs_bmap.o: $S/kernel/ufs_bmap.c
+	${COMPILE_C}
+
+ufs_dsort.o: $S/kernel/ufs_dsort.c
+	${COMPILE_C}
+
+ufs_fio.o: $S/kernel/ufs_fio.c
+	${COMPILE_C}
+
+ufs_inode.o: $S/kernel/ufs_inode.c
+	${COMPILE_C}
+
+ufs_mount.o: $S/kernel/ufs_mount.c
+	${COMPILE_C}
+
+ufs_namei.o: $S/kernel/ufs_namei.c
+	${COMPILE_C}
+
+ufs_subr.o: $S/kernel/ufs_subr.c
+	${COMPILE_C}
+
+ufs_syscalls.o: $S/kernel/ufs_syscalls.c
+	${COMPILE_C}
+
+ufs_syscalls2.o: $S/kernel/ufs_syscalls2.c
+	${COMPILE_C}
+
+vfs_vnops.o: $S/kernel/vfs_vnops.c
+	${COMPILE_C}
+
+vm_sched.o: $S/kernel/vm_sched.c
+	${COMPILE_C}
+
+vm_swap.o: $S/kernel/vm_swap.c
+	${COMPILE_C}
+
+vm_swp.o: $S/kernel/vm_swp.c
+	${COMPILE_C}
+
+adc.o: $S/pic32/adc.c
+	${COMPILE_C}
+
+clock.o: $S/pic32/clock.c
+	${COMPILE_C}
+
+cons.o: $S/pic32/cons.c
+	${COMPILE_C}
+
+devsw.o: $S/pic32/devsw.c
+	${COMPILE_C}
+
+exception.o: $S/pic32/exception.c
+	${COMPILE_C}
+
+gpio.o: $S/pic32/gpio.c
+	${COMPILE_C}
+
+machdep.o: $S/pic32/machdep.c
+	${COMPILE_C}
+
+mem.o: $S/pic32/mem.c
+	${COMPILE_C}
+
+pwm.o: $S/pic32/pwm.c
+	${COMPILE_C}
+
+rd_sd.o: $S/pic32/rd_sd.c
+	${COMPILE_C}
+
+signal.o: $S/pic32/signal.c
+	${COMPILE_C}
+
+spi.o: $S/pic32/spi.c
+	${COMPILE_C}
+
+spi_bus.o: $S/pic32/spi_bus.c
+	${COMPILE_C}
+
+swap.o: $S/pic32/swap.c
+	${COMPILE_C}
+
+sysctl.o: $S/pic32/sysctl.c
+	${COMPILE_C}
+
+usb_device.o: $S/pic32/usb_device.c
+	${COMPILE_C}
+
+usb_function_cdc.o: $S/pic32/usb_function_cdc.c
+	${COMPILE_C}
+
+usb_uart.o: $S/pic32/usb_uart.c
+	${COMPILE_C}
+
+
+ifeq (.deps, $(wildcard .deps))
+-include .deps/*.dep
+endif
diff --git a/sys/pic32/ubw32/Makefile-old b/sys/pic32/ubw32/Makefile-old
deleted file mode 100644
index 5e9a101..0000000
--- a/sys/pic32/ubw32/Makefile-old
+++ /dev/null
@@ -1,55 +0,0 @@
-BUILDPATH = ../../../tools/configsys/../../sys/pic32
-H         = ../../../tools/configsys/../../sys/include
-M         = ../../../tools/configsys/../../sys/pic32
-S         = ../../../tools/configsys/../../sys/kernel
-
-vpath %.c $(M):$(S)
-vpath %.S $(M):$(S)
-
-KERNOBJ += clock.o cons.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o gpio.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o rd_sd.o rdisk.o signal.o spi_bus.o startup.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o usb_device.o usb_function_cdc.o usb_uart.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o 
-EXTRA_TARGETS = 
-
-DEFS += -DBUS_DIV=1
-DEFS += -DBUS_KHZ='CPU_KHZ/BUS_DIV'
-DEFS += -DCONSOLE_DEVICE=ttyUSB0
-DEFS += -DCPU_IDIV=2
-DEFS += -DCPU_KHZ='((CRYSTAL*1000)/CPU_IDIV*CPU_MUL/CPU_ODIV)'
-DEFS += -DCPU_MUL=20
-DEFS += -DCPU_ODIV=1
-DEFS += -DCRYSTAL=8
-DEFS += -DEXEC_AOUT
-DEFS += -DEXEC_ELF
-DEFS += -DEXEC_SCRIPT
-DEFS += -DGPIO_ENABLED=YES
-DEFS += -DKERNEL
-DEFS += -DLED_DISK_INVERT=YES
-DEFS += -DLED_DISK_PIN=1
-DEFS += -DLED_DISK_PORT=TRISE
-DEFS += -DLED_KERNEL_INVERT=YES
-DEFS += -DLED_KERNEL_PIN=2
-DEFS += -DLED_KERNEL_PORT=TRISE
-DEFS += -DLED_SWAP_INVERT=YES
-DEFS += -DLED_SWAP_PIN=0
-DEFS += -DLED_SWAP_PORT=TRISE
-DEFS += -DLED_TTY_INVERT=YES
-DEFS += -DLED_TTY_PIN=3
-DEFS += -DLED_TTY_PORT=TRISE
-DEFS += -DPIC32MX7
-DEFS += -DSD0_CS_PIN=9
-DEFS += -DSD0_CS_PORT=TRISA
-DEFS += -DSD0_PORT=1
-DEFS += -DSD1_CS_PIN=10
-DEFS += -DSD1_CS_PORT=TRISA
-DEFS += -DSD1_PORT=1
-DEFS += -DUARTUSB_ENABLED=YES
-DEFS += -DUCB_METER
-DEFS += -DUSB_MAX_EP_NUMBER=3
-DEFS += -DUSB_NUM_STRING_DESCRIPTORS=3
-
-
-LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader-ubw32.ld
-
-CONFIG = UBW32
-CONFIGPATH = ../../../tools/configsys
-
-include ../../../tools/configsys/../../sys/pic32/kernel-post.mk
diff --git a/sys/pic32/ubw32/Makefile-uart-old b/sys/pic32/ubw32/Makefile-uart-old
deleted file mode 100644
index ad56cbf..0000000
--- a/sys/pic32/ubw32/Makefile-uart-old
+++ /dev/null
@@ -1,53 +0,0 @@
-BUILDPATH = ../../../tools/configsys/../../sys/pic32
-H         = ../../../tools/configsys/../../sys/include
-M         = ../../../tools/configsys/../../sys/pic32
-S         = ../../../tools/configsys/../../sys/kernel
-
-vpath %.c $(M):$(S)
-vpath %.S $(M):$(S)
-
-KERNOBJ += clock.o cons.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o gpio.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o rd_sd.o rdisk.o signal.o spi_bus.o startup.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o uart.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o 
-EXTRA_TARGETS = 
-
-DEFS += -DBUS_DIV=1
-DEFS += -DBUS_KHZ='CPU_KHZ/BUS_DIV'
-DEFS += -DCONSOLE_DEVICE=tty1
-DEFS += -DCPU_IDIV=2
-DEFS += -DCPU_KHZ='((CRYSTAL*1000)/CPU_IDIV*CPU_MUL/CPU_ODIV)'
-DEFS += -DCPU_MUL=20
-DEFS += -DCPU_ODIV=1
-DEFS += -DCRYSTAL=8
-DEFS += -DEXEC_AOUT
-DEFS += -DEXEC_ELF
-DEFS += -DEXEC_SCRIPT
-DEFS += -DGPIO_ENABLED=YES
-DEFS += -DKERNEL
-DEFS += -DLED_DISK_INVERT=YES
-DEFS += -DLED_DISK_PIN=1
-DEFS += -DLED_DISK_PORT=TRISE
-DEFS += -DLED_KERNEL_INVERT=YES
-DEFS += -DLED_KERNEL_PIN=2
-DEFS += -DLED_KERNEL_PORT=TRISE
-DEFS += -DLED_SWAP_INVERT=YES
-DEFS += -DLED_SWAP_PIN=0
-DEFS += -DLED_SWAP_PORT=TRISE
-DEFS += -DLED_TTY_INVERT=YES
-DEFS += -DLED_TTY_PIN=3
-DEFS += -DLED_TTY_PORT=TRISE
-DEFS += -DPIC32MX7
-DEFS += -DSD0_CS_PIN=9
-DEFS += -DSD0_CS_PORT=TRISA
-DEFS += -DSD0_PORT=1
-DEFS += -DSD1_CS_PIN=10
-DEFS += -DSD1_CS_PORT=TRISA
-DEFS += -DSD1_PORT=1
-DEFS += -DUART2_ENABLED=YES
-DEFS += -DUCB_METER
-
-
-LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader-ubw32.ld
-
-CONFIG = UBW32-UART
-CONFIGPATH = ../../../tools/configsys
-
-include ../../../tools/configsys/../../sys/pic32/kernel-post.mk
diff --git a/sys/pic32/ubw32/Makefile-uart-sdram-old b/sys/pic32/ubw32/Makefile-uart-sdram-old
deleted file mode 100644
index a0f9359..0000000
--- a/sys/pic32/ubw32/Makefile-uart-sdram-old
+++ /dev/null
@@ -1,52 +0,0 @@
-BUILDPATH = ../../../tools/configsys/../../sys/pic32
-H         = ../../../tools/configsys/../../sys/include
-M         = ../../../tools/configsys/../../sys/pic32
-S         = ../../../tools/configsys/../../sys/kernel
-
-vpath %.c $(M):$(S)
-vpath %.S $(M):$(S)
-
-KERNOBJ += clock.o cons.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o rd_sd.o rd_sdramp.o rdisk.o sdram.o signal.o spi_bus.o startup.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o uart.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o 
-EXTRA_TARGETS = 
-
-DEFS += -DBUS_DIV=1
-DEFS += -DBUS_KHZ='CPU_KHZ/BUS_DIV'
-DEFS += -DCONSOLE_DEVICE=tty1
-DEFS += -DCPU_IDIV=2
-DEFS += -DCPU_KHZ='((CRYSTAL*1000)/CPU_IDIV*CPU_MUL/CPU_ODIV)'
-DEFS += -DCPU_MUL=20
-DEFS += -DCPU_ODIV=1
-DEFS += -DCRYSTAL=8
-DEFS += -DEXEC_AOUT
-DEFS += -DEXEC_ELF
-DEFS += -DEXEC_SCRIPT
-DEFS += -DKERNEL
-DEFS += -DKERNEL_EXECUTABLE_RAM
-DEFS += -DLED_DISK_INVERT=YES
-DEFS += -DLED_DISK_PIN=9
-DEFS += -DLED_DISK_PORT=TRISB
-DEFS += -DLED_KERNEL_INVERT=YES
-DEFS += -DLED_KERNEL_PIN=10
-DEFS += -DLED_KERNEL_PORT=TRISB
-DEFS += -DLED_SWAP_INVERT=YES
-DEFS += -DLED_SWAP_PIN=8
-DEFS += -DLED_SWAP_PORT=TRISB
-DEFS += -DLED_TTY_INVERT=YES
-DEFS += -DLED_TTY_PIN=11
-DEFS += -DLED_TTY_PORT=TRISB
-DEFS += -DPARTITION="sdramp0:sa@2048,fs@14000"
-DEFS += -DPIC32MX7
-DEFS += -DSD0_CS_PIN=9
-DEFS += -DSD0_CS_PORT=TRISA
-DEFS += -DSD0_PORT=2
-DEFS += -DSDRAMP_ENABLED=YES
-DEFS += -DUART2_ENABLED=YES
-DEFS += -DUCB_METER
-
-
-LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader-sdram.ld
-
-CONFIG = UBW32-UART-SDRAM
-CONFIGPATH = ../../../tools/configsys
-
-include ../../../tools/configsys/../../sys/pic32/kernel-post.mk
diff --git a/sys/pic32/ubw32/UBW32-UART-SDRAM b/sys/pic32/ubw32/UBW32-UART-SDRAM
deleted file mode 100644
index 6b0d452..0000000
--- a/sys/pic32/ubw32/UBW32-UART-SDRAM
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# UBW32 board
-# ===========
-#
-# Console on UART2
-
-core pic32mx7
-linker bootloader-sdram
-mapping generic
-
-device kernel invled=B10
-device console invled=B11 device=tty1
-device uart2
-device rdisk invled=B9 invswap=B8
-device sd0 port=2 cs=A9
-device sdramp
-
-option PARTITION=sdramp0:sa@2048,fs@14000
diff --git a/sys/pic32/ubw32/devcfg.c b/sys/pic32/ubw32/devcfg.c
deleted file mode 100644
index ad48c89..0000000
--- a/sys/pic32/ubw32/devcfg.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Chip configuration.
- */
-#include "machine/pic32mx.h"
-
-PIC32_DEVCFG (
-    DEVCFG0_DEBUG_DISABLED,     /* ICE debugger enabled */
-
-    DEVCFG1_FNOSC_PRIPLL |      /* Primary oscillator with PLL */
-    DEVCFG1_POSCMOD_HS |        /* HS oscillator */
-    DEVCFG1_FPBDIV_1 |          /* Peripheral bus clock = SYSCLK/1 */
-    DEVCFG1_IESO |              /* Internal-external switch over */
-    DEVCFG1_WDTPS_1,            /* Watchdog postscale = 1/1 */
-
-    DEVCFG2_FPLLIDIV_2 |        /* PLL divider = 1/2 */
-    DEVCFG2_FPLLMUL_20 |        /* PLL multiplier = 20x */
-    DEVCFG2_UPLLIDIV_2 |        /* USB PLL divider = 1/2 */
-    DEVCFG2_FPLLODIV_1,         /* PLL postscaler = 1/1 */
-
-    DEVCFG3_USERID(0xffff) |    /* User-defined ID */
-    DEVCFG3_FSRSSEL_7 |         /* Assign irq priority 7 to shadow set */
-    DEVCFG3_FUSBIDIO |          /* USBID pin: controlled by USB */
-    DEVCFG3_FVBUSONIO |         /* VBuson pin: controlled by USB */
-    DEVCFG3_FCANIO |            /* Default CAN pins */
-    DEVCFG3_FETHIO);            /* Default Ethernet i/o pins */
diff --git a/sys/pic32/wf32/Makefile b/sys/pic32/wf32/Makefile
index 9d0ffec..de54310 100644
--- a/sys/pic32/wf32/Makefile
+++ b/sys/pic32/wf32/Makefile
@@ -123,10 +123,10 @@ swapunix.o: swapunix.c
 all: unix.elf
 
 clean:
-	rm -rf .deps *.elf *.o *.map *.dis *.bin
+	rm -rf .deps *.elf *.o *.map *.dis *.bin machine sys
 
 clean-all: clean
-	rm -f *.h *.c machine sys
+	rm -f *.h ioconf.c swapunix.c vers.c
 
 reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig
 	../../../tools/kconfig/kconfig Config