Remove integrity check in declare_cpu_ops_base

This check was added to ensure the correct behaviour of fill_constants
macro. This macro has been verified and it is known his correct
behaviour. The check generates an error when the clang assembler is
used, so it is better to remove the check.

Change-Id: I3447ff9e9e5ee5cf0502f65e53c3d105d9396b8b
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>

diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S
index 7ad801d839cd3e1986ba3b7db8a8ab3c092fc8a1..7703be339dc4459d0ada7f6d59e5c90a4b28bfcf 100644 (file)
--- a/include/lib/cpus/aarch32/cpu_macros.S
+++ b/include/lib/cpus/aarch32/cpu_macros.S
@@ -137,21 +137,8 @@
        .word \_resetfunc
 #endif
 #ifdef IMAGE_BL32
-1:
        /* Insert list of functions */
        fill_constants CPU_MAX_PWR_DWN_OPS, \_power_down_ops
-2:
-       /*
-        * Error if no or more than CPU_MAX_PWR_DWN_OPS were specified in the
-        * list
-        */
-       .ifeq 2b - 1b
-         .error "At least one power down function must be specified"
-       .else
-         .iflt 2b - 1b - (CPU_MAX_PWR_DWN_OPS * CPU_WORD_SIZE)
-           .error "More than CPU_MAX_PWR_DWN_OPS functions specified"
-         .endif
-       .endif
 #endif
 
 #if REPORT_ERRATA

diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S
index b1d5d1dbea0e93ea9fd9e94cebc65a21a4baed26..026a48e32ea6ef9a28a00a8a32d58cc75259f6de 100644 (file)
--- a/include/lib/cpus/aarch64/cpu_macros.S
+++ b/include/lib/cpus/aarch64/cpu_macros.S
@@ -159,21 +159,8 @@
        .quad \_extra1
        .quad \_extra2
 #ifdef IMAGE_BL31
-1:
        /* Insert list of functions */
        fill_constants CPU_MAX_PWR_DWN_OPS, \_power_down_ops
-2:
-       /*
-        * Error if no or more than CPU_MAX_PWR_DWN_OPS were specified in the
-        * list
-        */
-       .ifeq 2b - 1b
-         .error "At least one power down function must be specified"
-       .else
-         .iflt 2b - 1b - (CPU_MAX_PWR_DWN_OPS * CPU_WORD_SIZE)
-           .error "More than CPU_MAX_PWR_DWN_OPS functions specified"
-         .endif
-       .endif
 #endif
 
 #if REPORT_ERRATA