From 2ab2f4d3784692f8cd0e79d24638157926f894ca Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Mon, 21 Nov 2011 17:22:38 -0500
Subject: [UNDO] Rip out everything but libmaple and Wirish startup code.

We'll need to bring all this functionality back online piecemeal as we
add F2 support.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
 Makefile        |  8 ++++----
 wirish/rules.mk | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 9b37580..785b9a6 100644
--- a/Makefile
+++ b/Makefile
@@ -79,12 +79,12 @@ LIBMAPLE_MODULES += $(SRCROOT)/libmaple/usb   # USB FS device
 LIBMAPLE_MODULES += $(LIBMAPLE_MODULE_SERIES) # STM32 series submodule in libmaple
 LIBMAPLE_MODULES += $(SRCROOT)/wirish
 # Official libraries:
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/Servo
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/LiquidCrystal
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/Wire
+# LIBMAPLE_MODULES += $(SRCROOT)/libraries/Servo
+# LIBMAPLE_MODULES += $(SRCROOT)/libraries/LiquidCrystal
+# LIBMAPLE_MODULES += $(SRCROOT)/libraries/Wire
 
 # Experimental libraries:
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/FreeRTOS
+# LIBMAPLE_MODULES += $(SRCROOT)/libraries/FreeRTOS
 
 # Call each module's rules.mk:
 $(foreach m,$(LIBMAPLE_MODULES),$(eval $(call LIBMAPLE_MODULE_template,$(m))))
diff --git a/wirish/rules.mk b/wirish/rules.mk
index 6fa3a28..c72e60f 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -5,33 +5,33 @@ d               := $(dir)
 BUILDDIRS       += $(BUILD_PATH)/$(d)
 
 # Board config -- TODO allow user override
-WIRISH_BOARD_PATH := boards/$(BOARD)
-BUILDDIRS += $(BUILD_PATH)/$(d)/$(WIRISH_BOARD_PATH)
+# WIRISH_BOARD_PATH := boards/$(BOARD)
+# BUILDDIRS += $(BUILD_PATH)/$(d)/$(WIRISH_BOARD_PATH)
 
-WIRISH_INCLUDES := -I$(d)/include -I$(d)/$(WIRISH_BOARD_PATH)/include
+# WIRISH_INCLUDES := -I$(d)/include -I$(d)/$(WIRISH_BOARD_PATH)/include
 
 # Local flags
-CFLAGS_$(d) := $(WIRISH_INCLUDES) $(LIBMAPLE_INCLUDES)
+CFLAGS_$(d) := $(LIBMAPLE_INCLUDES)
 
 # Local rules and targets
 
 sSRCS_$(d) := start.S
 cSRCS_$(d) := start_c.c
-cppSRCS_$(d) := wirish_math.cpp		 \
-                Print.cpp		 \
-		boards.cpp               \
-                HardwareSerial.cpp	 \
-                HardwareSPI.cpp		 \
-		HardwareTimer.cpp	 \
-                usb_serial.cpp		 \
-                cxxabi-compat.cpp	 \
-		wirish_shift.cpp	 \
-		wirish_analog.cpp	 \
-		wirish_time.cpp		 \
-		pwm.cpp 		 \
-		ext_interrupts.cpp	 \
-		wirish_digital.cpp
-cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp
+# cppSRCS_$(d) := wirish_math.cpp		 \
+#                 Print.cpp		 \
+# 		boards.cpp               \
+#                 HardwareSerial.cpp	 \
+#                 HardwareSPI.cpp		 \
+# 		HardwareTimer.cpp	 \
+#                 usb_serial.cpp		 \
+#                 cxxabi-compat.cpp	 \
+# 		wirish_shift.cpp	 \
+# 		wirish_analog.cpp	 \
+# 		wirish_time.cpp		 \
+# 		pwm.cpp 		 \
+# 		ext_interrupts.cpp	 \
+# 		wirish_digital.cpp
+# cppSRCS_$(d) += $(WIRISH_BOARD_PATH)/board.cpp
 
 sFILES_$(d)   := $(sSRCS_$(d):%=$(d)/%)
 cFILES_$(d)   := $(cSRCS_$(d):%=$(d)/%)
-- 
cgit v1.2.3