From b7a3d6f66599d55b171b139f726ae25a3ce9eea8 Mon Sep 17 00:00:00 2001
From: Serge Vakulenko <serge.vakulenko@gmail.com>
Date: Wed, 30 Dec 2015 19:20:37 -0800
Subject: [PATCH] Enable uarts for pic32-retrobsd board. Fix build issues with
 fuse library path on Mac OS X.

---
 sys/pic32/pinguino-micro/Config   | 23 ++++++++++++++---------
 sys/pic32/pinguino-micro/Makefile |  9 +++++++--
 tools/fsutil/Makefile             |  8 +++++---
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/sys/pic32/pinguino-micro/Config b/sys/pic32/pinguino-micro/Config
index 483cb60..3bf3e03 100644
--- a/sys/pic32/pinguino-micro/Config
+++ b/sys/pic32/pinguino-micro/Config
@@ -1,7 +1,9 @@
 #
-# Olimex Pinguino-Micro board with PIC32MX795 processor
+# Olimex PIC32-RetroBSD board, or
+# Pinguino-Micro board with PIC32MX795 processor
 # =====================================================
 # Console on USB.
+# For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-Olimex-PIC32-RetroBSD
 #
 # To build the kernel, use:
 #   cd sys/pic32/pinguino-micro
@@ -37,6 +39,10 @@ device          uartusb
 options         "USB_MAX_EP_NUMBER=3"
 options         "USB_NUM_STRING_DESCRIPTORS=3"
 
+# Serial UART ports
+device          uart1                       # Pins 4, 5 at CON2 connector
+device          uart2                       # Pins 3, 4 at UEXT connector
+
 # SPI ports
 controller      spi2                        # SD card
 
@@ -45,14 +51,13 @@ device          sd0     at spi2 pin RB13    # select pin
 
 # General purpose I/O ports
 # Flags define a mask of available pins
-# The following pins excluded:
-#   RG6, RG7, RG8, RB13 - spi2, SD card
-device          gpio1   flags 0xdfff    # port B
-device          gpio2   flags 0xf000    # port C
-device          gpio3   flags 0x0fff    # port D
-device          gpio4   flags 0x00ff    # port E
-device          gpio5   flags 0x003b    # port F
-device          gpio6   flags 0x020c    # port G
+# See schematics for details
+device          gpio1   flags 0xdfff        # port B
+device          gpio2   flags 0x6000        # port C
+device          gpio3   flags 0x0ff3        # port D
+device          gpio4   flags 0x00ff        # port E
+device          gpio5   flags 0x000b        # port F
+device          gpio6   flags 0x0200        # port G
 
 # ADC driver
 device          adc
diff --git a/sys/pic32/pinguino-micro/Makefile b/sys/pic32/pinguino-micro/Makefile
index f1cd767..f545484 100644
--- a/sys/pic32/pinguino-micro/Makefile
+++ b/sys/pic32/pinguino-micro/Makefile
@@ -1,6 +1,8 @@
 PARAM = -DPINGUINO_MICRO
 PARAM += -DPIC32MX7
 PARAM += -DUARTUSB_ENABLED
+PARAM += -DUART1_ENABLED
+PARAM += -DUART2_ENABLED
 PARAM += -DSPI2_ENABLED
 PARAM += -DSD_ENABLED
 PARAM += -DGPIO1_ENABLED
@@ -63,7 +65,7 @@ OBJS = exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.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 clock.o cons.o devsw.o \
 	exception.o machdep.o mem.o signal.o swap.o sysctl.o adc.o \
-	gpio.o pwm.o sd.o spi.o spi_bus.o usb_device.o \
+	gpio.o pwm.o sd.o spi.o spi_bus.o uart.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 \
@@ -90,7 +92,7 @@ CFILES = $S/kernel/exec_aout.c $S/kernel/exec_conf.c $S/kernel/exec_elf.c \
 	$S/pic32/devsw.c $S/pic32/exception.c $S/pic32/machdep.c \
 	$S/pic32/mem.c $S/pic32/signal.c $S/pic32/swap.c \
 	$S/pic32/sysctl.c $S/pic32/adc.c $S/pic32/gpio.c $S/pic32/pwm.c \
-	$S/pic32/sd.c $S/pic32/spi.c $S/pic32/spi_bus.c \
+	$S/pic32/sd.c $S/pic32/spi.c $S/pic32/spi_bus.c $S/pic32/uart.c \
 	$S/pic32/usb_device.c $S/pic32/usb_function_cdc.c \
 	$S/pic32/usb_uart.c swapunix.c 
 
@@ -342,6 +344,9 @@ spi.o: $S/pic32/spi.c
 spi_bus.o: $S/pic32/spi_bus.c
 	${COMPILE_C}
 
+uart.o: $S/pic32/uart.c
+	${COMPILE_C}
+
 usb_device.o: $S/pic32/usb_device.c
 	${COMPILE_C}
 
diff --git a/tools/fsutil/Makefile b/tools/fsutil/Makefile
index 8bed77a..95426ec 100644
--- a/tools/fsutil/Makefile
+++ b/tools/fsutil/Makefile
@@ -6,11 +6,13 @@ OBJS		= fsutil.o superblock.o block.c inode.o create.o check.o \
 PROG		= fsutil
 
 # For Mac OS X
-#LIBS		= -largp
+ifneq ($(wildcard /usr/local/lib/pkgconfig),)
+    FUSE_PATH   = /usr/local/lib/pkgconfig
+endif
 
 # Fuse
-MOUNT_CFLAGS    = $(shell pkg-config fuse --cflags)
-LIBS            += $(shell pkg-config fuse --libs)
+MOUNT_CFLAGS    = $(shell PKG_CONFIG_PATH=$(FUSE_PATH) pkg-config fuse --cflags)
+LIBS            += $(shell PKG_CONFIG_PATH=$(FUSE_PATH) pkg-config fuse --libs)
 
 all:		$(PROG)