diff --git a/cc3200/boards/WIPY/pins.csv b/cc3200/boards/WIPY/pins.csv
index 38071e1307..5294181f31 100644
--- a/cc3200/boards/WIPY/pins.csv
+++ b/cc3200/boards/WIPY/pins.csv
@@ -1,25 +1,24 @@
-P12,58
-P13,4
-P14,3
-P15,61
-P16,59
-P17,5
-P18,62
-P19,1
-P110,2
-P33,57
-P34,60
-P37,63
-P38,53
-P39,64
-P310,50
-P49,16
-P410,17
-P22,18
-P23,8
-P24,45
-P26,7
-P27,6
-P28,21
-P29,55
-P210,15
\ No newline at end of file
+L2,GPIO2
+L3,GPIO1
+L4,GPIO23
+L5,GPIO24
+L6,GPIO11
+L7,GPIO12
+L8,GPIO13
+L9,GPIO14
+L10,GPIO15
+L11,GPIO16
+L12,GPIO17
+L13,GPIO22
+L14,GPIO28
+R4,GPIO10
+R5,GPIO9
+R6,GPIO8
+R7,GPIO7
+R8,GPIO6
+R9,GPIO30
+R10,GPIO31
+R11,GPIO3
+R12,GPIO0
+R13,GPIO4
+R14,GPIO5
diff --git a/cc3200/boards/WIPY_SD/mpconfigboard.h b/cc3200/boards/WIPY_SD/mpconfigboard.h
index d29fe58f5a..b8e785733d 100644
--- a/cc3200/boards/WIPY_SD/mpconfigboard.h
+++ b/cc3200/boards/WIPY_SD/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define MICROPY_HW_BOARD_NAME                       "WiPy_SD"
 #define MICROPY_HW_MCU_NAME                         "CC3200"
 
-#define MICROPY_HW_HAS_SDCARD                       (0)
+#define MICROPY_HW_HAS_SDCARD                       (1)
 #define MICROPY_HW_ENABLE_RNG                       (1)
 #define MICROPY_HW_ENABLE_RTC                       (1)
 
diff --git a/cc3200/boards/WIPY_SD/pins.csv b/cc3200/boards/WIPY_SD/pins.csv
index 38071e1307..5294181f31 100644
--- a/cc3200/boards/WIPY_SD/pins.csv
+++ b/cc3200/boards/WIPY_SD/pins.csv
@@ -1,25 +1,24 @@
-P12,58
-P13,4
-P14,3
-P15,61
-P16,59
-P17,5
-P18,62
-P19,1
-P110,2
-P33,57
-P34,60
-P37,63
-P38,53
-P39,64
-P310,50
-P49,16
-P410,17
-P22,18
-P23,8
-P24,45
-P26,7
-P27,6
-P28,21
-P29,55
-P210,15
\ No newline at end of file
+L2,GPIO2
+L3,GPIO1
+L4,GPIO23
+L5,GPIO24
+L6,GPIO11
+L7,GPIO12
+L8,GPIO13
+L9,GPIO14
+L10,GPIO15
+L11,GPIO16
+L12,GPIO17
+L13,GPIO22
+L14,GPIO28
+R4,GPIO10
+R5,GPIO9
+R6,GPIO8
+R7,GPIO7
+R8,GPIO6
+R9,GPIO30
+R10,GPIO31
+R11,GPIO3
+R12,GPIO0
+R13,GPIO4
+R14,GPIO5
diff --git a/cc3200/boards/make-pins.py b/cc3200/boards/make-pins.py
index ebe7e6a33a..4d9257afdf 100644
--- a/cc3200/boards/make-pins.py
+++ b/cc3200/boards/make-pins.py
@@ -38,7 +38,7 @@ class Pin(object):
 
     def set_is_board_pin(self):
         self.board_pin = True
-        
+
     def print(self):
         print('pin_obj_t pin_{:6s} = PIN({:6s}, {:1d}, {:3d}, {:2d});'.format(
                self.name, self.name, self.port, self.gpio_bit, self.pin_num))
@@ -56,12 +56,17 @@ class Pins(object):
         for pin in self.cpu_pins:
             if pin.port == port and pin.gpio_bit == gpio_bit:
                 return pin
-                
+
     def find_pin_by_num(self, pin_num):
         for pin in self.cpu_pins:
             if pin.pin_num == pin_num:
                 return pin
 
+    def find_pin_by_name(self, name):
+        for pin in self.cpu_pins:
+            if pin.name == name:
+                return pin
+
     def parse_af_file(self, filename, pin_col, pinname_col):
         with open(filename, 'r') as csvfile:
             rows = csv.reader(csvfile)
@@ -76,13 +81,16 @@ class Pins(object):
                 pin_num = int(row[pin_col]) - 1;        
                 pin = Pin(row[pinname_col], port_num, gpio_bit, pin_num)
                 self.cpu_pins.append(pin)
-                
-    def parse_board_file(self, filename, cpu_pin_num_col):
+
+    def parse_board_file(self, filename, cpu_pin_col):
         with open(filename, 'r') as csvfile:
             rows = csv.reader(csvfile)
             for row in rows:
                 # Pin numbers must start from 0 when used with the TI API
-                pin = self.find_pin_by_num(int(row[cpu_pin_num_col]) - 1)
+                if row[cpu_pin_col].isdigit():
+                    pin = self.find_pin_by_num(int(row[cpu_pin_col]) - 1)
+                else:
+                    pin = self.find_pin_by_name(row[cpu_pin_col])
                 if pin:
                     pin.set_is_board_pin()