Rename corstone1000 platform references

In all other SW components and documentation, the corstone1000 is
written all together, without the dash separating the name and
the version. To make TS coherent to all other projects and
documentation sed/corstone-1000/corstone1000/ and rename directories
and files concordantly.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Change-Id: Ied909a0a3d232d30c3bbaec6750b8b1e38db7d0b
diff --git a/deployments/se-proxy/config/corstone-1000-opteesp/CMakeLists.txt b/deployments/se-proxy/config/corstone1000-opteesp/CMakeLists.txt
similarity index 97%
rename from deployments/se-proxy/config/corstone-1000-opteesp/CMakeLists.txt
rename to deployments/se-proxy/config/corstone1000-opteesp/CMakeLists.txt
index 4e26c53..1691329 100644
--- a/deployments/se-proxy/config/corstone-1000-opteesp/CMakeLists.txt
+++ b/deployments/se-proxy/config/corstone1000-opteesp/CMakeLists.txt
@@ -11,7 +11,7 @@
 include(../../../deployment.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
-#  The CMakeLists.txt for building the se-proxy deployment for Corstone-1000
+#  The CMakeLists.txt for building the se-proxy deployment for Corstone1000
 #  using the "opteesp" environment.
 #
 #-------------------------------------------------------------------------------
@@ -43,7 +43,7 @@
 )
 
 include(../../env/commonsp/se_proxy_sp.cmake REQUIRED)
-include(../../infra/corstone-1000/infra.cmake REQUIRED)
+include(../../infra/corstone1000/infra.cmake REQUIRED)
 include(../../se-proxy.cmake REQUIRED)
 
 #-------------------------------------------------------------------------------
diff --git a/deployments/se-proxy/config/corstone-1000-opteesp/default_se-proxy.dts.in b/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
similarity index 100%
rename from deployments/se-proxy/config/corstone-1000-opteesp/default_se-proxy.dts.in
rename to deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
diff --git a/deployments/se-proxy/config/corstone-1000-opteesp/optee_sp_user_defines.h b/deployments/se-proxy/config/corstone1000-opteesp/optee_sp_user_defines.h
similarity index 100%
rename from deployments/se-proxy/config/corstone-1000-opteesp/optee_sp_user_defines.h
rename to deployments/se-proxy/config/corstone1000-opteesp/optee_sp_user_defines.h
diff --git a/deployments/se-proxy/infra/corstone-1000/infra.cmake b/deployments/se-proxy/infra/corstone1000/infra.cmake
similarity index 100%
rename from deployments/se-proxy/infra/corstone-1000/infra.cmake
rename to deployments/se-proxy/infra/corstone1000/infra.cmake
diff --git a/deployments/se-proxy/infra/corstone-1000/service_proxy_factory.c b/deployments/se-proxy/infra/corstone1000/service_proxy_factory.c
similarity index 100%
rename from deployments/se-proxy/infra/corstone-1000/service_proxy_factory.c
rename to deployments/se-proxy/infra/corstone1000/service_proxy_factory.c
diff --git a/tools/b-test/test_data.yaml b/tools/b-test/test_data.yaml
index f94c2ad..f2cb2f0 100644
--- a/tools/b-test/test_data.yaml
+++ b/tools/b-test/test_data.yaml
@@ -154,7 +154,7 @@
       params:
             - "-GUnix Makefiles"
     - name: "se-proxy-default-opteesp"
-      src: "$TS_ROOT/deployments/se-proxy/config/corstone-1000-opteesp"
+      src: "$TS_ROOT/deployments/se-proxy/config/corstone1000-opteesp"
       params:
             - "-GUnix Makefiles"
     - name: "se-proxy-default-opteesp"