Unify PSA code generators

.travis.yml

@@ -324,7 +324,5 @@ matrix:
         - NAME=psa-autogen
       script:
         # Run SPM code generators and check that changes are not needed
-        - python tools/psa/generate_mbed_spm_partition_code.py
-        - git diff --exit-code
-        - python tools/psa/generate_tfm_partition_code.py
+        - python tools/psa/generate_partition_code.py
         - git diff --exit-code

tools/psa/generate_partition_code.py

@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# Copyright (c) 2017-2019 ARM Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from generate_mbed_spm_partition_code import generate_psa_code
+from generate_tfm_partition_code import generate_tfm_code
+
+generate_psa_code()
+generate_tfm_code()