diff options
Diffstat (limited to 'plat/arm/board/common')
-rw-r--r-- | plat/arm/board/common/aarch32/board_arm_helpers.S | 3 | ||||
-rw-r--r-- | plat/arm/board/common/aarch64/board_arm_helpers.S | 3 | ||||
-rw-r--r-- | plat/arm/board/common/board_arm_trusted_boot.c | 16 | ||||
-rw-r--r-- | plat/arm/board/common/board_common.mk | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/plat/arm/board/common/aarch32/board_arm_helpers.S b/plat/arm/board/common/aarch32/board_arm_helpers.S index d64da292ad..320bfb3c34 100644 --- a/plat/arm/board/common/aarch32/board_arm_helpers.S +++ b/plat/arm/board/common/aarch32/board_arm_helpers.S @@ -3,8 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> #include <v2m_def.h> .globl plat_report_exception diff --git a/plat/arm/board/common/aarch64/board_arm_helpers.S b/plat/arm/board/common/aarch64/board_arm_helpers.S index 4385e62ba8..5a905244f4 100644 --- a/plat/arm/board/common/aarch64/board_arm_helpers.S +++ b/plat/arm/board/common/aarch64/board_arm_helpers.S @@ -3,8 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include <asm_macros.S> -#include <bl_common.h> +#include <common/bl_common.h> #include <v2m_def.h> .globl plat_report_exception diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c index 6c03c91b5d..64ca3c36d8 100644 --- a/plat/arm/board/common/board_arm_trusted_boot.c +++ b/plat/arm/board/common/board_arm_trusted_boot.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arm_def.h> #include <assert.h> -#include <cassert.h> -#include <platform.h> #include <stdint.h> #include <string.h> -#include <tbbr_oid.h> + +#include <lib/cassert.h> +#include <plat/common/platform.h> +#include <tools_share/tbbr_oid.h> + +#include <arm_def.h> /* SHA256 algorithm */ #define SHA256_BYTES 32 @@ -180,9 +182,9 @@ int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr) } #else /* ARM_CRYPTOCELL_INTEG */ -#include <nvm.h> -#include <nvm_otp.h> -#include <sbrom_bsv_api.h> +#include <drivers/arm/cryptocell/nvm.h> +#include <drivers/arm/cryptocell/nvm_otp.h> +#include <drivers/arm/cryptocell/sbrom_bsv_api.h> CASSERT(HASH_RESULT_SIZE_IN_BYTES == SHA256_BYTES, assert_mismatch_in_hash_result_size); diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk index 2556fc04af..487aad7399 100644 --- a/plat/arm/board/common/board_common.mk +++ b/plat/arm/board/common/board_common.mk @@ -4,8 +4,7 @@ # SPDX-License-Identifier: BSD-3-Clause # -PLAT_INCLUDES += -Iinclude/drivers/cfi/ \ - -Iinclude/plat/arm/board/common/ +PLAT_INCLUDES += -Iinclude/plat/arm/board/common/ PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \ plat/arm/board/common/${ARCH}/board_arm_helpers.S |