diff --git a/Makefile b/Makefile
index 6c8092c395ce60ea16c806f71d2a1011ae067d4a..277dd02a7b10f04790c491ad40b99dc09f580df0 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SUBDIRS := miosix
 ## List here your source files (both .s, .c and .cpp)
 ##
 SRC :=                                  \
-main.cpp
+miosix/testsuite/testsuite.cpp
 
 ##
 ## List here additional static libraries with relative path
diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc
index b6faf846789101297779bd69bc6afb67ea9f1ead..d9a4e9b8eac92fe346777c8bb9e12c8d7673c93e 100644
--- a/miosix/config/Makefile.inc
+++ b/miosix/config/Makefile.inc
@@ -13,7 +13,7 @@
 ## architecture
 ##
 #OPT_BOARD := lpc2138_miosix_board
-OPT_BOARD := stm32f103ze_stm3210e-eval
+#OPT_BOARD := stm32f103ze_stm3210e-eval
 #OPT_BOARD := stm32f103ve_mp3v2
 #OPT_BOARD := stm32f100rb_stm32vldiscovery
 #OPT_BOARD := stm32f103ve_strive_mini
@@ -21,6 +21,7 @@ OPT_BOARD := stm32f103ze_stm3210e-eval
 #OPT_BOARD := stm32f407vg_stm32f4discovery
 #OPT_BOARD := stm32f207ig_stm3220g-eval
 #OPT_BOARD := stm32f207zg_ethboard_v2
+OPT_BOARD := stm32f207ze_camboard
 
 ##
 ## Optimization flags, choose one.
@@ -235,6 +236,8 @@ else ifeq ($(OPT_BOARD),stm32f207ig_stm3220g-eval)
     ARCH := cortexM3_stm32f2
 else ifeq ($(OPT_BOARD),stm32f207zg_ethboard_v2)
     ARCH := cortexM3_stm32f2
+else ifeq ($(OPT_BOARD),stm32f207ze_camboard)
+    ARCH := cortexM3_stm32f2
 else
     $(error Error: no board specified in miosix/config/Makefile.inc)
 endif
@@ -731,6 +734,43 @@ else ifeq ($(ARCH),cortexM3_stm32f2)
         PROGRAM_CMDLINE := stm32flash -w main.hex -v /dev/ttyUSB1
         endif
 
+    ##-------------------------------------------------------------------------
+    ## BOARD: stm32f207ze_camboard
+    ##
+    else ifeq ($(OPT_BOARD),stm32f207ze_camboard)
+        ## Base directory with header files for this board
+        BOARD_INC := arch/cortexM3_stm32f2/stm32f207ze_camboard
+
+        ## Select linker script and boot file
+        ## Their path must be relative to the miosix directory.
+        BOOT_FILE := $(BOARD_INC)/core/stage_1_boot.o
+        LINKER_SCRIPT := $(BOARD_INC)/stm32_1m+128k_rom.ld
+
+        ## Select architecture specific files
+        ## These are the files in arch/<arch name>/<board name>
+        ARCH_SRC :=                                  \
+        $(BOARD_INC)/interfaces-impl/console.cpp     \
+        $(BOARD_INC)/interfaces-impl/delays.cpp      \
+        $(BOARD_INC)/interfaces-impl/bsp.cpp
+
+        ## Add a #define to allow querying board name
+        CFLAGS_BASE   += -D_BOARD_CAMBOARD
+        CXXFLAGS_BASE += -D_BOARD_CAMBOARD
+
+        ## Clock frequency
+        CLOCK_FREQ := -DHSE_VALUE=8000000 -DSYSCLK_FREQ_120MHz=120000000
+
+        ## XRAM is always enabled in this board
+        XRAM += -D__ENABLE_XRAM
+
+        ## Select programmer command line
+        ## This is the program that is invoked when the user types
+        ## 'make program'
+        ## The command must provide a way to program the board, or print an
+        ## error message saying that 'make program' is not supported for that
+        ## board.
+        PROGRAM_CMDLINE := stm32flash -w main.hex -v /dev/ttyUSB1
+
     ##-------------------------------------------------------------------------
     ## End of board list
     ##
diff --git a/miosix/config/miosix_settings.h b/miosix/config/miosix_settings.h
index 879e4424ba23ff24ee989c90f4a4da29d74a0f90..911f483a971aa1044b99cc272e5839334e4bd605 100644
--- a/miosix/config/miosix_settings.h
+++ b/miosix/config/miosix_settings.h
@@ -69,7 +69,7 @@ namespace miosix {
 /// \def WITH_FILESYSTEM
 /// Allows to enable/disable filesystem support.
 /// By default it is defined (filesystem support is enabled)
-#define WITH_FILESYSTEM
+//#define WITH_FILESYSTEM
     
 /// \def SYNC_AFTER_WRITE
 /// Increases filesystem write robustness. After each write operation the
diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml
index f21407ad6000792f1e7d69eccfd2ef7c14a6aa0e..9efe2d3a469bf268688f93544ca2d7e66d5a5390 100644
--- a/miosix_np_2/nbproject/configurations.xml
+++ b/miosix_np_2/nbproject/configurations.xml
@@ -64,6 +64,7 @@
                 <in>delays.cpp</in>
                 <in>disk.cpp</in>
                 <in>endianness_impl.h</in>
+                <in>gpio_impl.cpp</in>
                 <in>gpio_impl.h</in>
                 <in>portability.cpp</in>
                 <in>portability_impl.h</in>
@@ -166,6 +167,21 @@
               </df>
               <in>board_settings.h</in>
             </df>
+            <df name="stm32f207ze_camboard">
+              <df name="core">
+                <in>stage_1_boot.cpp</in>
+              </df>
+              <df name="interfaces-impl">
+                <in>bsp.cpp</in>
+                <in>bsp_impl.h</in>
+                <in>console-impl.h</in>
+                <in>console.cpp</in>
+                <in>delays.cpp</in>
+                <in>hwmapping.h</in>
+              </df>
+              <in>board_settings.h</in>
+              <in>stm32_1m+128k_rom.ld</in>
+            </df>
             <df name="stm32f207zg_EthBoardV2">
               <df name="core">
                 <in>stage_1_boot.cpp</in>
@@ -309,6 +325,8 @@
         <df name="util">
           <in>crc16.cpp</in>
           <in>crc16.h</in>
+          <in>lcd44780.cpp</in>
+          <in>lcd44780.h</in>
           <in>software_i2c.h</in>
           <in>software_spi.h</in>
           <in>util.cpp</in>
diff --git a/miosix_np_2/nbproject/private/private.xml b/miosix_np_2/nbproject/private/private.xml
index 2bcf1ef4e7ee574b8b884b38bf134ee89c747b5d..e67bac43e71759e08a1e965bc199c26fa10b1520 100644
--- a/miosix_np_2/nbproject/private/private.xml
+++ b/miosix_np_2/nbproject/private/private.xml
@@ -5,7 +5,7 @@
     </code-assistance-data>
     <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
         <activeConfTypeElem>0</activeConfTypeElem>
-        <activeConfIndexElem>2</activeConfIndexElem>
+        <activeConfIndexElem>9</activeConfIndexElem>
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
 </project-private>