fix(nxp/layerscape): update build config and variants for ls1043a
As replaced new implementation for NXP ls1043a platform in tf-a
(plat/layerscape/board/ls1043/) with new implementation (plat/nxp/soc-ls1043a/),
so need to update build config and variants accordingly in CI.
Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
Change-Id: I712a0a39d284816bfa8bebeae3f81063d5a52d33
diff --git a/group/tf-l1-build-plat/ls1043-default:nil b/group/tf-l1-build-plat/ls1043-default:nil
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-build-plat/ls1043-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/ls1043-opteed:nil b/group/tf-l1-build-plat/ls1043-opteed:nil
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-build-plat/ls1043-opteed:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/ls1043-tspd:nil b/group/tf-l1-build-plat/ls1043-tspd:nil
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-build-plat/ls1043-tspd:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-build-plat/ls1043ardb-default:nil b/group/tf-l1-build-plat/ls1043ardb-default:nil
new file mode 100644
index 0000000..3f7598a
--- /dev/null
+++ b/group/tf-l1-build-plat/ls1043ardb-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 69492f0..0ba1475 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -403,11 +403,21 @@
clean_build PLAT=ls1028ardb $(common_flags) all BOOT_MODE=emmc
clean_build PLAT=ls1028ardb $(common_flags) all BOOT_MODE=sd
-# Secure Boot
+# ls1028a Secure Boot
clean_build PLAT=ls1028ardb $(common_flags) all BOOT_MODE=flexspi_nor $nxp_sb_fuse_flags
clean_build PLAT=ls1028ardb $(common_flags) all BOOT_MODE=emmc $nxp_sb_fuse_flags
clean_build PLAT=ls1028ardb $(common_flags) all BOOT_MODE=sd $nxp_sb_fuse_flags
+# Platform ls1043ardb
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=nor
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=nand
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=sd
+
+# ls1043ardb Secure Boot
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=nor $nxp_sb_fuse_flags
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=nand $nxp_sb_fuse_flags
+clean_build PLAT=ls1043ardb $(common_flags) all BOOT_MODE=sd $nxp_sb_fuse_flags
+
# Platforms from Intel
make PLAT=stratix10 $(common_flags) all
make PLAT=agilex $(common_flags) all
@@ -599,11 +609,6 @@
ENABLE_STACK_PROTECTOR=strong PRELOADED_BL33_BASE=0xDEADBEEF all
clean_build PLAT=rpi4 $(common_flags) SMC_PCI_SUPPORT=1 all
-# Cannot use $(common_flags) for LS1043 platform, as then
-# the binaries do not fit in memory.
-clean_build PLAT=ls1043 SPD=opteed ENABLE_STACK_PROTECTOR=strong
-clean_build PLAT=ls1043 SPD=tspd
-
# A113D (AXG) platform.
clean_build PLAT=axg $(common_flags) SPD=opteed
clean_build PLAT=axg $(common_flags) AML_USE_ATOS=1
diff --git a/tf_config/ls1043-opteed b/tf_config/ls1043-opteed
deleted file mode 100644
index 5de8020..0000000
--- a/tf_config/ls1043-opteed
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-LOG_LEVEL=0
-PLAT=ls1043
-SPD=opteed
-DEBUG=0
diff --git a/tf_config/ls1043-tspd b/tf_config/ls1043-tspd
deleted file mode 100644
index 6c710a2..0000000
--- a/tf_config/ls1043-tspd
+++ /dev/null
@@ -1,5 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-ENABLE_BACKTRACE=0
-LOG_LEVEL=0
-PLAT=ls1043
-SPD=tspd
diff --git a/tf_config/ls1043-default b/tf_config/ls1043ardb-default
similarity index 66%
rename from tf_config/ls1043-default
rename to tf_config/ls1043ardb-default
index ec965cf..58af8c3 100644
--- a/tf_config/ls1043-default
+++ b/tf_config/ls1043ardb-default
@@ -1,2 +1,2 @@
CROSS_COMPILE=aarch64-none-elf-
-PLAT=ls1043
+PLAT=ls1043ardb