From 9fdad69909a58139d73169cc3e0d555387e60f48 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Fri, 4 May 2018 10:54:33 +0100 Subject: [PATCH] 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 --- include/lib/cpus/aarch32/cpu_macros.S | 13 ------------- include/lib/cpus/aarch64/cpu_macros.S | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S index 7ad801d83..7703be339 100644 --- 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 b1d5d1dbe..026a48e32 100644 --- 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