Skip to content

GitLab

Commit 01c44ddd authored by Alexei Fedorov's avatar Alexei Fedorov Committed by TrustedFirmware Code Review
Browse files

Merge "Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__" into integration

parents f61469e5 d5dfdeb6
master v2.5 v2.5-rc1 v2.5-rc0 v2.4 v2.4-rc2 v2.4-rc1 v2.4-rc0 v2.3 v2.3-rc2 v2.3-rc1 v2.3-rc0 v2.2 v2.2-rc2 v2.2-rc1 v2.2-rc0 arm_cca_v0.2 arm_cca_v0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 20 deletions
+20 -20
plat/nvidia/tegra/include/tegra_platform.h
View file @ 01c44ddd
......@@ -30,7 +30,7 @@
#define TEGRA_CHIPID_TEGRA21 U(0x21)
#define TEGRA_CHIPID_TEGRA18 U(0x18)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
/*
* Tegra chip ID major/minor identifiers
......@@ -57,6 +57,6 @@ bool tegra_platform_is_fpga(void);
bool tegra_platform_is_unit_fpga(void);
bool tegra_platform_is_virt_dev_kit(void);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* TEGRA_PLATFORM_H */
plat/renesas/rcar/include/platform_def.h
View file @ 01c44ddd
......@@ -7,7 +7,7 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdlib.h>
#endif
......
plat/rockchip/common/include/plat_private.h
View file @ 01c44ddd
......@@ -7,7 +7,7 @@
#ifndef PLAT_PRIVATE_H
#define PLAT_PRIVATE_H
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -140,7 +140,7 @@ extern const mmap_region_t plat_rk_mmap[];
uint32_t rockchip_get_uart_base(void);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
/******************************************************************************
* cpu up status
......
plat/rockchip/common/pmusram/cpus_on_fixed_addr.h
View file @ 01c44ddd
......@@ -26,7 +26,7 @@
#define PM_WARM_BOOT_SHT 0
#define PM_WARM_BOOT_BIT (1 << PM_WARM_BOOT_SHT)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
struct psram_data_t {
uint64_t sp;
......@@ -50,6 +50,6 @@ CASSERT(__builtin_offsetof(struct psram_data_t, boot_mpidr) == PSRAM_DT_MPIDR,
extern void *sys_sleep_flag_sram;
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif
plat/st/stm32mp1/stm32mp1_def.h
View file @ 01c44ddd
......@@ -14,7 +14,7 @@
#include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.h>
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <drivers/st/stm32mp1_clk.h>
#include <boot_api.h>
......@@ -40,7 +40,7 @@
#endif
/* DDR power initializations */
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
enum ddr_type {
STM32MP_DDR3,
STM32MP_LPDDR2,
......@@ -254,7 +254,7 @@ enum ddr_type {
#define TAMP_BASE U(0x5C00A000)
#define TAMP_BKP_REGISTER_BASE (TAMP_BASE + U(0x100))
#if !(defined(__LINKER__) || defined(__ASSEMBLY__))
#if !(defined(__LINKER__) || defined(__ASSEMBLER__))
static inline uint32_t tamp_bkpr(uint32_t idx)
{
return TAMP_BKP_REGISTER_BASE + (idx << 2);
......
services/spd/opteed/opteed_private.h
View file @ 01c44ddd
......@@ -79,7 +79,7 @@
#define OPTEED_C_RT_CTX_SIZE 0x60
#define OPTEED_C_RT_CTX_ENTRIES (OPTEED_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -157,6 +157,6 @@ void opteed_init_optee_ep_state(struct entry_point_info *optee_entry_point,
extern optee_context_t opteed_sp_context[OPTEED_CORE_COUNT];
extern uint32_t opteed_rw;
extern struct optee_vectors *optee_vector_table;
#endif /*__ASSEMBLY__*/
#endif /*__ASSEMBLER__*/
#endif /* OPTEED_PRIVATE_H */
services/spd/tlkd/tlkd_private.h
View file @ 01c44ddd
......@@ -71,7 +71,7 @@
#define TLKD_C_RT_CTX_SIZE 0x60
#define TLKD_C_RT_CTX_ENTRIES (TLKD_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -119,6 +119,6 @@ void tlkd_init_tlk_ep_state(struct entry_point_info *tlk_entry_point,
uint64_t pc,
tlk_context_t *tlk_ctx);
#endif /*__ASSEMBLY__*/
#endif /*__ASSEMBLER__*/
#endif /* TLKD_PRIVATE_H */
services/spd/tspd/tspd_private.h
View file @ 01c44ddd
......@@ -126,7 +126,7 @@
#define TSPD_SP_CTX_SIZE 0x90
#define TSPD_SP_CTX_ENTRIES (TSPD_SP_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -227,6 +227,6 @@ uint64_t tspd_handle_sp_preemption(void *handle);
extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT];
extern tsp_vectors_t *tsp_vectors;
#endif /*__ASSEMBLY__*/
#endif /*__ASSEMBLER__*/
#endif /* TSPD_PRIVATE_H */
services/std_svc/spm/spm_private.h
View file @ 01c44ddd
......@@ -32,7 +32,7 @@
/* Value returned by spm_sp_synchronous_entry() when a partition is preempted */
#define SPM_SECURE_PARTITION_PREEMPTED U(0x1234)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -114,6 +114,6 @@ int spm_response_add(uint16_t client_id, uint16_t handle, uint32_t token,
int spm_response_get(uint16_t client_id, uint16_t handle, uint32_t token,
u_register_t *x1, u_register_t *x2, u_register_t *x3);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* SPM_PRIVATE_H */
services/std_svc/spm_mm/spm_private.h
View file @ 01c44ddd
......@@ -29,7 +29,7 @@
#define SP_C_RT_CTX_SIZE 0x60
#define SP_C_RT_CTX_ENTRIES (SP_C_RT_CTX_SIZE >> DWORD_SHIFT)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <stdint.h>
......@@ -66,6 +66,6 @@ int spm_memory_attributes_set_smc_handler(sp_context_t *sp_ctx,
u_register_t pages_count,
u_register_t smc_attributes);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* SPM_PRIVATE_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment