diff options
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/aarch32/arch.h | 10 | ||||
| -rw-r--r-- | include/lib/aarch32/smcc_helpers.h | 14 | ||||
| -rw-r--r-- | include/lib/aarch32/smcc_macros.S | 15 | ||||
| -rw-r--r-- | include/lib/aarch64/arch.h | 4 | ||||
| -rw-r--r-- | include/lib/aarch64/smcc_helpers.h | 14 | ||||
| -rw-r--r-- | include/lib/cpus/aarch32/cortex_a53.h | 12 | ||||
| -rw-r--r-- | include/lib/cpus/aarch32/cortex_a57.h | 18 | ||||
| -rw-r--r-- | include/lib/cpus/aarch32/cortex_a72.h | 12 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cortex_a53.h | 17 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cortex_a57.h | 18 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cortex_a72.h | 12 | ||||
| -rw-r--r-- | include/lib/el3_runtime/context_mgmt.h | 10 | ||||
| -rw-r--r-- | include/lib/libc/cdefs.h | 9 | ||||
| -rw-r--r-- | include/lib/psci/psci.h | 9 | ||||
| -rw-r--r-- | include/lib/psci/psci_compat.h | 93 | ||||
| -rw-r--r-- | include/lib/smcc.h | 14 | ||||
| -rw-r--r-- | include/lib/smccc.h | 11 | ||||
| -rw-r--r-- | include/lib/smccc_v1.h | 3 | ||||
| -rw-r--r-- | include/lib/utils.h | 4 | ||||
| -rw-r--r-- | include/lib/utils_def.h | 2 | ||||
| -rw-r--r-- | include/lib/xlat_tables/xlat_mmu_helpers.h | 5 | ||||
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables.h | 4 | ||||
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_v2.h | 4 |
23 files changed, 11 insertions, 303 deletions
diff --git a/include/lib/aarch32/arch.h b/include/lib/aarch32/arch.h index f9ed56e2..3536d203 100644 --- a/include/lib/aarch32/arch.h +++ b/include/lib/aarch32/arch.h @@ -126,10 +126,6 @@ #define SDCR_SPD_ENABLE U(0x3) #define SDCR_RESET_VAL U(0x0) -#if !ERROR_DEPRECATED -#define SDCR_DEF_VAL SDCR_SPD(SDCR_SPD_DISABLE) -#endif - /* HSCTLR definitions */ #define HSCTLR_RES1 ((U(1) << 29) | (U(1) << 28) | (U(1) << 23) | \ (U(1) << 22) | (U(1) << 18) | (U(1) << 16) | \ @@ -220,10 +216,6 @@ #define NSASEDIS_BIT (U(1) << 15) #define NSTRCDIS_BIT (U(1) << 20) /* NOTE: correct typo in the definitions */ -#if !ERROR_DEPRECATED -#define NASCR_CP11_BIT (U(1) << 11) -#define NASCR_CP10_BIT (U(1) << 10) -#endif #define NSACR_CP11_BIT (U(1) << 11) #define NSACR_CP10_BIT (U(1) << 10) #define NSACR_IMP_DEF_MASK (U(0x7) << 16) @@ -576,7 +568,7 @@ #define PAR_F_SHIFT U(0) #define PAR_F_MASK ULL(0x1) #define PAR_ADDR_SHIFT U(12) -#define PAR_ADDR_MASK (BIT(40) - ULL(1)) /* 40-bits-wide page address */ +#define PAR_ADDR_MASK (BIT_64(40) - ULL(1)) /* 40-bits-wide page address */ /******************************************************************************* * Definitions for system register interface to AMU for ARMv8.4 onwards diff --git a/include/lib/aarch32/smcc_helpers.h b/include/lib/aarch32/smcc_helpers.h deleted file mode 100644 index 7f79f8fa..00000000 --- a/include/lib/aarch32/smcc_helpers.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef __SMCC_HELPERS_H__ -#define __SMCC_HELPERS_H__ - -#if !ERROR_DEPRECATED -#include <smccc_helpers.h> -#endif - -#endif /* __SMCC_HELPERS_H__ */ diff --git a/include/lib/aarch32/smcc_macros.S b/include/lib/aarch32/smcc_macros.S deleted file mode 100644 index 66f3d0ea..00000000 --- a/include/lib/aarch32/smcc_macros.S +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#ifndef __SMCC_MACROS_S__ -#define __SMCC_MACROS_S__ - -#if !ERROR_DEPRECATED -#include <smccc_macros.S> - -#define smcc_save_gp_mode_regs smccc_save_gp_mode_regs -#endif - -#endif /* __SMCC_MACROS_S__ */ diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index fed59445..a6022cb0 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -245,10 +245,6 @@ #define MDCR_TPM_BIT (U(1) << 6) #define MDCR_EL3_RESET_VAL U(0x0) -#if !ERROR_DEPRECATED -#define MDCR_DEF_VAL (MDCR_SDD_BIT | MDCR_SPD32(MDCR_SPD32_DISABLE)) -#endif - /* MDCR_EL2 definitions */ #define MDCR_EL2_TPMS (U(1) << 14) #define MDCR_EL2_E2PB(x) ((x) << 12) diff --git a/include/lib/aarch64/smcc_helpers.h b/include/lib/aarch64/smcc_helpers.h deleted file mode 100644 index 11300b7e..00000000 --- a/include/lib/aarch64/smcc_helpers.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef __SMCC_HELPERS_H__ -#define __SMCC_HELPERS_H__ - -#if !ERROR_DEPRECATED -#include <smccc_helpers.h> -#endif - -#endif /* __SMCC_HELPERS_H__ */ diff --git a/include/lib/cpus/aarch32/cortex_a53.h b/include/lib/cpus/aarch32/cortex_a53.h index 8e86df46..a7a681f5 100644 --- a/include/lib/cpus/aarch32/cortex_a53.h +++ b/include/lib/cpus/aarch32/cortex_a53.h @@ -67,16 +67,4 @@ ******************************************************************************/ #define CORTEX_A53_L2MERRSR p15, 3, c15 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions so - * as not to break platforms that continue using them. - */ -#define CORTEX_A53_ACTLR CORTEX_A53_CPUACTLR - -#define CORTEX_A53_ACTLR_ENDCCASCI_SHIFT CORTEX_A53_CPUACTLR_ENDCCASCI_SHIFT -#define CORTEX_A53_ACTLR_ENDCCASCI CORTEX_A53_CPUACTLR_ENDCCASCI -#define CORTEX_A53_ACTLR_DTAH CORTEX_A53_CPUACTLR_DTAH -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A53_H__ */ diff --git a/include/lib/cpus/aarch32/cortex_a57.h b/include/lib/cpus/aarch32/cortex_a57.h index 18cabe11..3f0fb04b 100644 --- a/include/lib/cpus/aarch32/cortex_a57.h +++ b/include/lib/cpus/aarch32/cortex_a57.h @@ -79,22 +79,4 @@ ******************************************************************************/ #define CORTEX_A57_L2MERRSR p15, 3, c15 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions so - * as not to break platforms that continue using them. - */ -#define CORTEX_A57_ACTLR CORTEX_A57_CPUACTLR - -#define CORTEX_A57_ACTLR_DIS_LOAD_PASS_DMB CORTEX_A57_CPUACTLR_DIS_LOAD_PASS_DMB -#define CORTEX_A57_ACTLR_GRE_NGRE_AS_NGNRE CORTEX_A57_CPUACTLR_GRE_NGRE_AS_NGNRE -#define CORTEX_A57_ACTLR_DIS_OVERREAD CORTEX_A57_CPUACTLR_DIS_OVERREAD -#define CORTEX_A57_ACTLR_NO_ALLOC_WBWA CORTEX_A57_CPUACTLR_NO_ALLOC_WBWA -#define CORTEX_A57_ACTLR_DCC_AS_DCCI CORTEX_A57_CPUACTLR_DCC_AS_DCCI -#define CORTEX_A57_ACTLR_FORCE_FPSCR_FLUSH CORTEX_A57_CPUACTLR_FORCE_FPSCR_FLUSH -#define CORTEX_A57_ACTLR_DIS_STREAMING CORTEX_A57_CPUACTLR_DIS_STREAMING -#define CORTEX_A57_ACTLR_DIS_L1_STREAMING CORTEX_A57_CPUACTLR_DIS_L1_STREAMING -#define CORTEX_A57_ACTLR_DIS_INDIRECT_PREDICTOR CORTEX_A57_CPUACTLR_DIS_INDIRECT_PREDICTOR -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A57_H__ */ diff --git a/include/lib/cpus/aarch32/cortex_a72.h b/include/lib/cpus/aarch32/cortex_a72.h index 0331ace7..1a3c014e 100644 --- a/include/lib/cpus/aarch32/cortex_a72.h +++ b/include/lib/cpus/aarch32/cortex_a72.h @@ -54,16 +54,4 @@ ******************************************************************************/ #define CORTEX_A72_L2MERRSR p15, 3, c15 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions so - * as not to break platforms that continue using them. - */ -#define CORTEX_A72_ACTLR CORTEX_A72_CPUACTLR - -#define CORTEX_A72_ACTLR_DISABLE_L1_DCACHE_HW_PFTCH CORTEX_A72_CPUACTLR_DISABLE_L1_DCACHE_HW_PFTCH -#define CORTEX_A72_ACTLR_NO_ALLOC_WBWA CORTEX_A72_CPUACTLR_NO_ALLOC_WBWA -#define CORTEX_A72_ACTLR_DCC_AS_DCCI CORTEX_A72_CPUACTLR_DCC_AS_DCCI -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A72_H__ */ diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h index 22c68006..9aa118b5 100644 --- a/include/lib/cpus/aarch64/cortex_a53.h +++ b/include/lib/cpus/aarch64/cortex_a53.h @@ -71,21 +71,4 @@ ******************************************************************************/ #define CORTEX_A53_L2MERRSR_EL1 S3_1_C15_C2_3 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions - * so as not to break platforms that continue using them. - */ -#define CORTEX_A53_ACTLR_EL1 CORTEX_A53_CPUACTLR_EL1 - -#define CORTEX_A53_ACTLR_ENDCCASCI_SHIFT CORTEX_A53_CPUACTLR_EL1_ENDCCASCI_SHIFT -#define CORTEX_A53_ACTLR_ENDCCASCI CORTEX_A53_CPUACTLR_EL1_ENDCCASCI -#define CORTEX_A53_ACTLR_RADIS_SHIFT CORTEX_A53_CPUACTLR_EL1_RADIS_SHIFT -#define CORTEX_A53_ACTLR_RADIS CORTEX_A53_CPUACTLR_EL1_RADIS -#define CORTEX_A53_ACTLR_L1RADIS_SHIFT CORTEX_A53_CPUACTLR_EL1_L1RADIS_SHIFT -#define CORTEX_A53_ACTLR_L1RADIS CORTEX_A53_CPUACTLR_EL1_L1RADIS -#define CORTEX_A53_ACTLR_DTAH_SHIFT CORTEX_A53_CPUACTLR_EL1_DTAH_SHIFT -#define CORTEX_A53_ACTLR_DTAH CORTEX_A53_CPUACTLR_EL1_DTAH -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A53_H__ */ diff --git a/include/lib/cpus/aarch64/cortex_a57.h b/include/lib/cpus/aarch64/cortex_a57.h index 83ec9342..97d074e0 100644 --- a/include/lib/cpus/aarch64/cortex_a57.h +++ b/include/lib/cpus/aarch64/cortex_a57.h @@ -81,22 +81,4 @@ ******************************************************************************/ #define CORTEX_A57_L2MERRSR_EL1 S3_1_C15_C2_3 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions so - * as not to break platforms that continue using them. - */ -#define CORTEX_A57_ACTLR_EL1 CORTEX_A57_CPUACTLR_EL1 - -#define CORTEX_A57_ACTLR_DIS_LOAD_PASS_DMB CORTEX_A57_CPUACTLR_EL1_DIS_LOAD_PASS_DMB -#define CORTEX_A57_ACTLR_GRE_NGRE_AS_NGNRE CORTEX_A57_CPUACTLR_EL1_GRE_NGRE_AS_NGNRE -#define CORTEX_A57_ACTLR_DIS_OVERREAD CORTEX_A57_CPUACTLR_EL1_DIS_OVERREAD -#define CORTEX_A57_ACTLR_NO_ALLOC_WBWA CORTEX_A57_CPUACTLR_EL1_NO_ALLOC_WBWA -#define CORTEX_A57_ACTLR_DCC_AS_DCCI CORTEX_A57_CPUACTLR_EL1_DCC_AS_DCCI -#define CORTEX_A57_ACTLR_FORCE_FPSCR_FLUSH CORTEX_A57_CPUACTLR_EL1_FORCE_FPSCR_FLUSH -#define CORTEX_A57_ACTLR_DIS_STREAMING CORTEX_A57_CPUACTLR_EL1_DIS_STREAMING -#define CORTEX_A57_ACTLR_DIS_L1_STREAMING CORTEX_A57_CPUACTLR_EL1_DIS_L1_STREAMING -#define CORTEX_A57_ACTLR_DIS_INDIRECT_PREDICTOR CORTEX_A57_CPUACTLR_EL1_DIS_INDIRECT_PREDICTOR -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A57_H__ */ diff --git a/include/lib/cpus/aarch64/cortex_a72.h b/include/lib/cpus/aarch64/cortex_a72.h index f5ca2ee7..5b9e06de 100644 --- a/include/lib/cpus/aarch64/cortex_a72.h +++ b/include/lib/cpus/aarch64/cortex_a72.h @@ -61,16 +61,4 @@ ******************************************************************************/ #define CORTEX_A72_L2MERRSR_EL1 S3_1_C15_C2_3 -#if !ERROR_DEPRECATED -/* - * These registers were previously wrongly named. Provide previous definitions so - * as not to break platforms that continue using them. - */ -#define CORTEX_A72_ACTLR CORTEX_A72_CPUACTLR_EL1 - -#define CORTEX_A72_ACTLR_DISABLE_L1_DCACHE_HW_PFTCH CORTEX_A72_CPUACTLR_EL1_DISABLE_L1_DCACHE_HW_PFTCH -#define CORTEX_A72_ACTLR_NO_ALLOC_WBWA CORTEX_A72_CPUACTLR_EL1_NO_ALLOC_WBWA -#define CORTEX_A72_ACTLR_DCC_AS_DCCI CORTEX_A72_CPUACTLR_EL1_DCC_AS_DCCI -#endif /* !ERROR_DEPRECATED */ - #endif /* __CORTEX_A72_H__ */ diff --git a/include/lib/el3_runtime/context_mgmt.h b/include/lib/el3_runtime/context_mgmt.h index e3f7726a..c5bbb2b4 100644 --- a/include/lib/el3_runtime/context_mgmt.h +++ b/include/lib/el3_runtime/context_mgmt.h @@ -47,16 +47,6 @@ void cm_write_scr_el3_bit(uint32_t security_state, void cm_set_next_eret_context(uint32_t security_state); uint32_t cm_get_scr_el3(uint32_t security_state); - -void cm_init_context(uint64_t mpidr, - const struct entry_point_info *ep) __deprecated; - -void *cm_get_context_by_mpidr(uint64_t mpidr, - uint32_t security_state) __deprecated; -void cm_set_context_by_mpidr(uint64_t mpidr, - void *context, - uint32_t security_state) __deprecated; - /* Inline definitions */ /******************************************************************************* diff --git a/include/lib/libc/cdefs.h b/include/lib/libc/cdefs.h index b1d10ccc..0d007225 100644 --- a/include/lib/libc/cdefs.h +++ b/include/lib/libc/cdefs.h @@ -14,6 +14,15 @@ #define __unused __attribute__((__unused__)) #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) +#if RECLAIM_INIT_CODE +/* + * Add each function to a section that is unique so the functions can still + * be garbage collected + */ +#define __init __section(".text.init." __FILE__ "." __XSTRING(__LINE__)) +#else +#define __init +#endif #define __printflike(fmtarg, firstvararg) \ __attribute__((__format__ (__printf__, fmtarg, firstvararg))) diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index fa0da9fe..b27e4815 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -10,9 +10,6 @@ #include <bakery_lock.h> #include <bl_common.h> #include <platform_def.h> /* for PLAT_NUM_PWR_DOMAINS */ -#if ENABLE_PLAT_COMPAT -#include <psci_compat.h> -#endif #include <psci_lib.h> /* To maintain compatibility for SPDs */ #include <utils_def.h> @@ -350,12 +347,6 @@ int psci_features(unsigned int psci_fid); void __dead2 psci_power_down_wfi(void); void psci_arch_setup(void); -/* - * The below API is deprecated. This is now replaced by bl31_warmboot_entry in - * AArch64. - */ -void psci_entrypoint(void) __deprecated; - #endif /*__ASSEMBLY__*/ #endif /* PSCI_H */ diff --git a/include/lib/psci/psci_compat.h b/include/lib/psci/psci_compat.h deleted file mode 100644 index 11ed16d0..00000000 --- a/include/lib/psci/psci_compat.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef PSCI_COMPAT_H -#define PSCI_COMPAT_H - -#include <arch.h> -#include <platform_def.h> -#include <utils_def.h> - -#ifndef __ASSEMBLY__ -/* - * The below declarations are to enable compatibility for the platform ports - * using the old platform interface and psci helpers. - */ -#define PLAT_MAX_PWR_LVL PLATFORM_MAX_AFFLVL -#define PLAT_NUM_PWR_DOMAINS PLATFORM_NUM_AFFS - -/******************************************************************************* - * PSCI affinity related constants. An affinity instance could - * be present or absent physically to cater for asymmetric topologies. - ******************************************************************************/ -#define PSCI_AFF_ABSENT 0x0 -#define PSCI_AFF_PRESENT 0x1 - -#define PSCI_STATE_ON U(0x0) -#define PSCI_STATE_OFF U(0x1) -#define PSCI_STATE_ON_PENDING U(0x2) -#define PSCI_STATE_SUSPEND U(0x3) - -/* - * Using the compatibility platform interfaces means that the local states - * used in psci_power_state_t need to only convey whether its power down - * or standby state. The onus is on the platform port to do the right thing - * including the state coordination in case multiple power down states are - * involved. Hence if we assume 3 generic states viz, run, standby and - * power down, we can assign 1 and 2 to standby and power down respectively. - */ -#define PLAT_MAX_RET_STATE U(1) -#define PLAT_MAX_OFF_STATE U(2) - -/* - * Macro to represent invalid affinity level within PSCI. - */ -#define PSCI_INVALID_DATA -1 - -#define psci_get_pstate_afflvl(pstate) psci_get_pstate_pwrlvl(pstate) - -/* - * This array stores the 'power_state' requests of each CPU during - * CPU_SUSPEND and SYSTEM_SUSPEND which will be populated by the - * compatibility layer when appropriate platform hooks are invoked. - */ -extern unsigned int psci_power_state_compat[PLATFORM_CORE_COUNT]; - -/******************************************************************************* - * Structure populated by platform specific code to export routines which - * perform common low level pm functions - ******************************************************************************/ -typedef struct plat_pm_ops { - void (*affinst_standby)(unsigned int power_state); - int (*affinst_on)(unsigned long mpidr, - unsigned long sec_entrypoint, - unsigned int afflvl, - unsigned int state); - void (*affinst_off)(unsigned int afflvl, unsigned int state); - void (*affinst_suspend)(unsigned long sec_entrypoint, - unsigned int afflvl, - unsigned int state); - void (*affinst_on_finish)(unsigned int afflvl, unsigned int state); - void (*affinst_suspend_finish)(unsigned int afflvl, - unsigned int state); - void (*system_off)(void) __dead2; - void (*system_reset)(void) __dead2; - int (*validate_power_state)(unsigned int power_state); - int (*validate_ns_entrypoint)(unsigned long ns_entrypoint); - unsigned int (*get_sys_suspend_power_state)(void); -} plat_pm_ops_t; - -/******************************************************************************* - * Function & Data prototypes to enable compatibility for older platform ports - ******************************************************************************/ -int psci_get_suspend_stateid_by_mpidr(unsigned long); -int psci_get_suspend_stateid(void); -int psci_get_suspend_powerstate(void); -unsigned int psci_get_max_phys_off_afflvl(void); -int psci_get_suspend_afflvl(void); - -#endif /* ____ASSEMBLY__ */ -#endif /* PSCI_COMPAT_H */ diff --git a/include/lib/smcc.h b/include/lib/smcc.h deleted file mode 100644 index ed1da2cf..00000000 --- a/include/lib/smcc.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef __SMCC_H__ -#define __SMCC_H__ - -#if !ERROR_DEPRECATED -#include <smccc.h> -#endif - -#endif /* __SMCC_H__ */ diff --git a/include/lib/smccc.h b/include/lib/smccc.h index a07e510b..b3dad102 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -57,17 +57,6 @@ * does not equal SMC_UNK. This is to ensure that the caller won't mistake the * returned UUID in x0 for an invalid SMC error return */ -#if !ERROR_DEPRECATED -#define DEFINE_SVC_UUID(_name, _tl, _tm, _th, _cl, _ch, \ - _n0, _n1, _n2, _n3, _n4, _n5) \ - CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\ - static const uuid_t _name = { \ - _tl, _tm, _th, _cl, _ch, \ - { _n0, _n1, _n2, _n3, _n4, _n5 } \ - } -#endif - - #define DEFINE_SVC_UUID2(_name, _tl, _tm, _th, _cl, _ch, \ _n0, _n1, _n2, _n3, _n4, _n5) \ CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\ diff --git a/include/lib/smccc_v1.h b/include/lib/smccc_v1.h index 8718d158..98ef0211 100644 --- a/include/lib/smccc_v1.h +++ b/include/lib/smccc_v1.h @@ -66,9 +66,6 @@ #define SMC_32 U(0) #define SMC_TYPE_FAST ULL(1) -#if !ERROR_DEPRECATED -#define SMC_TYPE_STD ULL(0) -#endif #define SMC_TYPE_YIELD ULL(0) #define SMC_OK ULL(0) diff --git a/include/lib/utils.h b/include/lib/utils.h index 09ec8d99..d46d8461 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -7,10 +7,6 @@ #ifndef __UTILS_H__ #define __UTILS_H__ -#if !ERROR_DEPRECATED -#include <utils_def.h> -#endif - /* * C code should be put in this part of the header to avoid breaking ASM files * or linker scripts including it. diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index 5b4fd780..1dd57cb3 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -50,7 +50,7 @@ #define div_round_up(val, div) __extension__ ({ \ __typeof__(div) _div = (div); \ - ((val) + _div - 1) / _div; \ + ((val) + _div - (__typeof__(div)) 1) / _div; \ }) #define MIN(x, y) __extension__ ({ \ diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index ab491e36..85effcaa 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h @@ -67,11 +67,6 @@ void setup_mmu_cfg(uint64_t *params, unsigned int flags, #ifdef AARCH32 /* AArch32 specific translation table API */ -#if !ERROR_DEPRECATED -void enable_mmu_secure(unsigned int flags); -void enable_mmu_direct(unsigned int flags); -#endif - void enable_mmu_svc_mon(unsigned int flags); void enable_mmu_hyp(unsigned int flags); diff --git a/include/lib/xlat_tables/xlat_tables.h b/include/lib/xlat_tables/xlat_tables.h index 4097c76f..050679d9 100644 --- a/include/lib/xlat_tables/xlat_tables.h +++ b/include/lib/xlat_tables/xlat_tables.h @@ -71,10 +71,6 @@ #define MT_CODE (MT_MEMORY | MT_RO | MT_EXECUTE) #define MT_RO_DATA (MT_MEMORY | MT_RO | MT_EXECUTE_NEVER) -#if !ERROR_DEPRECATED -typedef unsigned int mmap_attr_t; -#endif - /* * Structure for specifying a single region of memory. */ diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 52c4dc6d..4bd0bb23 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h @@ -104,10 +104,6 @@ #define MT_RO_DATA (MT_MEMORY | MT_RO | MT_EXECUTE_NEVER) #define MT_RW_DATA (MT_MEMORY | MT_RW | MT_EXECUTE_NEVER) -#if !ERROR_DEPRECATED -typedef unsigned int mmap_attr_t; -#endif - /* * Structure for specifying a single region of memory. */ |