diff --git a/configs/README.txt b/configs/README.txt
index b4700433b75..23f5e4380d4 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -160,6 +160,9 @@ defconfig -- This is a configuration file similar to the Linux
     CONFIG_ARCH_IRQPRIO
       Define if the architecture suports prioritizaton of interrupts
       and the up_prioritize_irq() API.
+    CONFIG_ADDRENV
+      The CPU supports an MMU and CPU port supports provision of address
+      environments for tasks (making the, perhaps, processes).
 
   Some architectures require a description of the RAM configuration:
 
diff --git a/configs/pic32-starterkit/src/up_spi.c b/configs/pic32-starterkit/src/up_spi.c
index 52d46af89b1..42e7c4b9cf1 100644
--- a/configs/pic32-starterkit/src/up_spi.c
+++ b/configs/pic32-starterkit/src/up_spi.c
@@ -154,7 +154,7 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #endif
 #endif
 
-#ifdef CONFIG_PIC31MX_SPI1
+#ifdef CONFIG_PIC32MX_SPI1
 void  pic31mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -176,7 +176,7 @@ int pic31mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #endif
 #endif
 
-#ifdef CONFIG_PIC31MX_SPI3
+#ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
diff --git a/configs/pic32mx7mmb/src/up_spi.c b/configs/pic32mx7mmb/src/up_spi.c
index a15881868e6..add2b2d6537 100644
--- a/configs/pic32mx7mmb/src/up_spi.c
+++ b/configs/pic32mx7mmb/src/up_spi.c
@@ -192,7 +192,7 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #endif
 #endif
 
-#ifdef CONFIG_PIC31MX_SPI2
+#ifdef CONFIG_PIC32MX_SPI2
 void  pic31mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -215,7 +215,7 @@ int pic31mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #endif
 #endif
 
-#ifdef CONFIG_PIC31MX_SPI3
+#ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");