diff --git a/boards/ST_EVB_SPC560BC/board.mk b/boards/ST_EVB_SPC560BC/board.mk
index 8021c4510..92aadc984 100644
--- a/boards/ST_EVB_SPC560BC/board.mk
+++ b/boards/ST_EVB_SPC560BC/board.mk
@@ -1,5 +1,5 @@
# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC560BC/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_EVB_SPC560BC/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC560BC
+BOARDINC = ${CHIBIOS}/boards/ST_EVB_SPC560BC
diff --git a/boards/ST_EVB_SPC560P/board.mk b/boards/ST_EVB_SPC560P/board.mk
index 3eba54437..01d5f533b 100644
--- a/boards/ST_EVB_SPC560P/board.mk
+++ b/boards/ST_EVB_SPC560P/board.mk
@@ -1,5 +1,5 @@
# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC560P/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_EVB_SPC560P/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC560P
+BOARDINC = ${CHIBIOS}/boards/ST_EVB_SPC560P
diff --git a/boards/ST_EVB_SPC563M/board.mk b/boards/ST_EVB_SPC563M/board.mk
index f48dbe7af..63b4368ec 100644
--- a/boards/ST_EVB_SPC563M/board.mk
+++ b/boards/ST_EVB_SPC563M/board.mk
@@ -1,5 +1,5 @@
# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC563M/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_EVB_SPC563M/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC563M
+BOARDINC = ${CHIBIOS}/boards/ST_EVB_SPC563M
diff --git a/boards/ST_EVB_SPC564A/board.mk b/boards/ST_EVB_SPC564A/board.mk
index 392a9f076..1dc4a1117 100644
--- a/boards/ST_EVB_SPC564A/board.mk
+++ b/boards/ST_EVB_SPC564A/board.mk
@@ -1,5 +1,5 @@
# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC564A/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_EVB_SPC564A/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC564A
+BOARDINC = ${CHIBIOS}/boards/ST_EVB_SPC564A
diff --git a/boards/ST_EVB_SPC56EL/board.mk b/boards/ST_EVB_SPC56EL/board.mk
index 2d4706daa..8e5c03bce 100644
--- a/boards/ST_EVB_SPC56EL/board.mk
+++ b/boards/ST_EVB_SPC56EL/board.mk
@@ -1,5 +1,5 @@
# List of all the board related files.
-BOARDSRC = ${CHIBIOS}/boards/GENERIC_SPC56EL/board.c
+BOARDSRC = ${CHIBIOS}/boards/ST_EVB_SPC56EL/board.c
# Required include directories
-BOARDINC = ${CHIBIOS}/boards/GENERIC_SPC56EL
+BOARDINC = ${CHIBIOS}/boards/ST_EVB_SPC56EL
diff --git a/demos/PPC-SPC560B-GCC/.project b/demos/PPC-SPC560B-GCC/.project
index 117228290..4b773c630 100644
--- a/demos/PPC-SPC560B-GCC/.project
+++ b/demos/PPC-SPC560B-GCC/.project
@@ -27,7 +27,7 @@
board
2
- CHIBIOS/boards/GENERIC_SPC560BC
+ CHIBIOS/boards/ST_EVB_SPC560BC
os
diff --git a/demos/PPC-SPC560B-GCC/Makefile b/demos/PPC-SPC560B-GCC/Makefile
index e51e064f1..67a818a04 100644
--- a/demos/PPC-SPC560B-GCC/Makefile
+++ b/demos/PPC-SPC560B-GCC/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/GENERIC_SPC560BC/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC560BC/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC560BCxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC560BCxx/port.mk
diff --git a/demos/PPC-SPC560P-GCC/.project b/demos/PPC-SPC560P-GCC/.project
index bfb6550ac..8f550f87d 100644
--- a/demos/PPC-SPC560P-GCC/.project
+++ b/demos/PPC-SPC560P-GCC/.project
@@ -27,7 +27,7 @@
board
2
- CHIBIOS/boards/GENERIC_SPC560P
+ CHIBIOS/boards/ST_EVB_SPC560P
os
diff --git a/demos/PPC-SPC560P-GCC/Makefile b/demos/PPC-SPC560P-GCC/Makefile
index 66d880da3..2f567c047 100644
--- a/demos/PPC-SPC560P-GCC/Makefile
+++ b/demos/PPC-SPC560P-GCC/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/GENERIC_SPC560P/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC560P/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC560Pxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Pxx/port.mk
diff --git a/demos/PPC-SPC563M-GCC/.project b/demos/PPC-SPC563M-GCC/.project
index 562a9ec5e..28c9b4382 100644
--- a/demos/PPC-SPC563M-GCC/.project
+++ b/demos/PPC-SPC563M-GCC/.project
@@ -27,7 +27,7 @@
board
2
- CHIBIOS/boards/GENERIC_SPC563M
+ CHIBIOS/boards/ST_EVB_SPC563M
os
diff --git a/demos/PPC-SPC563M-GCC/Makefile b/demos/PPC-SPC563M-GCC/Makefile
index ac86cf7cc..cb7e7760d 100644
--- a/demos/PPC-SPC563M-GCC/Makefile
+++ b/demos/PPC-SPC563M-GCC/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/GENERIC_SPC563M/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC563M/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC563Mxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC563Mxx/port.mk
diff --git a/demos/PPC-SPC564A-GCC/Makefile b/demos/PPC-SPC564A-GCC/Makefile
index cb04f6c2f..9ae094063 100644
--- a/demos/PPC-SPC564A-GCC/Makefile
+++ b/demos/PPC-SPC564A-GCC/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/GENERIC_SPC564A/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC564A/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC564Axx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC564Axx/port.mk
diff --git a/demos/PPC-SPC56EL-GCC/.cproject b/demos/PPC-SPC56EL-GCC/.cproject
index c50ef16a0..ac5bc86e0 100644
--- a/demos/PPC-SPC56EL-GCC/.cproject
+++ b/demos/PPC-SPC56EL-GCC/.cproject
@@ -48,4 +48,5 @@
+
diff --git a/demos/PPC-SPC56EL-GCC/.project b/demos/PPC-SPC56EL-GCC/.project
index 67220475f..d8776f952 100644
--- a/demos/PPC-SPC56EL-GCC/.project
+++ b/demos/PPC-SPC56EL-GCC/.project
@@ -27,7 +27,7 @@
board
2
- CHIBIOS/boards/GENERIC_SPC56EL
+ CHIBIOS/boards/ST_EVB_SPC56EL
os
diff --git a/demos/PPC-SPC56EL-GCC/Makefile b/demos/PPC-SPC56EL-GCC/Makefile
index 2860f13bc..913d339d6 100644
--- a/demos/PPC-SPC56EL-GCC/Makefile
+++ b/demos/PPC-SPC56EL-GCC/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../..
-include $(CHIBIOS)/boards/GENERIC_SPC56EL/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC56EL/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC56ELxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC56ELxx/port.mk
diff --git a/testhal/SPC560Pxx/PWM-ICU/.cproject b/testhal/SPC560Pxx/PWM-ICU/.cproject
new file mode 100644
index 000000000..18c26cafe
--- /dev/null
+++ b/testhal/SPC560Pxx/PWM-ICU/.cproject
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testhal/SPC560Pxx/PWM-ICU/.project b/testhal/SPC560Pxx/PWM-ICU/.project
new file mode 100644
index 000000000..4c2d806c5
--- /dev/null
+++ b/testhal/SPC560Pxx/PWM-ICU/.project
@@ -0,0 +1,38 @@
+
+
+ SPC560Pxx-PWM-ICU
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
+
+ board
+ 2
+ CHIBIOS/boards/ST_EVB_SPC560P
+
+
+ os
+ 2
+ CHIBIOS/os
+
+
+
diff --git a/testhal/SPC560Pxx/PWM-ICU/Makefile b/testhal/SPC560Pxx/PWM-ICU/Makefile
index c83bf319e..ed51f07b7 100644
--- a/testhal/SPC560Pxx/PWM-ICU/Makefile
+++ b/testhal/SPC560Pxx/PWM-ICU/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../../..
-include $(CHIBIOS)/boards/GENERIC_SPC560P/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC560P/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC560Pxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC560Pxx/port.mk
diff --git a/testhal/SPC56ELxx/PWM-ICU/.cproject b/testhal/SPC56ELxx/PWM-ICU/.cproject
new file mode 100644
index 000000000..dd958292f
--- /dev/null
+++ b/testhal/SPC56ELxx/PWM-ICU/.cproject
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testhal/SPC56ELxx/PWM-ICU/.project b/testhal/SPC56ELxx/PWM-ICU/.project
new file mode 100644
index 000000000..80fb08c6f
--- /dev/null
+++ b/testhal/SPC56ELxx/PWM-ICU/.project
@@ -0,0 +1,38 @@
+
+
+ SPC56ELxx-PWM-ICU
+
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
+
+ board
+ 2
+ CHIBIOS/boards/ST_EVB_SPC56EL
+
+
+ os
+ 2
+ CHIBIOS/os
+
+
+
diff --git a/testhal/SPC56ELxx/PWM-ICU/Makefile b/testhal/SPC56ELxx/PWM-ICU/Makefile
index f92194c5c..7de6c8b42 100644
--- a/testhal/SPC56ELxx/PWM-ICU/Makefile
+++ b/testhal/SPC56ELxx/PWM-ICU/Makefile
@@ -46,7 +46,7 @@ PROJECT = ch
# Imported source files
CHIBIOS = ../../..
-include $(CHIBIOS)/boards/GENERIC_SPC56EL/board.mk
+include $(CHIBIOS)/boards/ST_EVB_SPC56EL/board.mk
include $(CHIBIOS)/os/hal/platforms/SPC56ELxx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/PPC/SPC56ELxx/port.mk