diff --git a/docs/change-log.rst b/docs/change-log.rst index 95361e9553bf1dcbfad92a9552263eef69592a8a..d329e83641ba62860597f874b2456aa8cd998e9b 100644 --- a/docs/change-log.rst +++ b/docs/change-log.rst @@ -61,11 +61,11 @@ New Features - Introduce RAS handling on AArch64 - - Some RAS extensions are mandatory for ARMv8.2 CPUs, with others - mandatory for ARMv8.4 CPUs however, all extensions are also optional - extensions to the base ARMv8.0 architecture. + - Some RAS extensions are mandatory for Armv8.2 CPUs, with others + mandatory for Armv8.4 CPUs however, all extensions are also optional + extensions to the base Armv8.0 architecture. - - The ARMv8 RAS Extensions introduced Standard Error Records which are a + - The Armv8 RAS Extensions introduced Standard Error Records which are a set of standard registers to configure RAS node policy and allow RAS Nodes to record and expose error information for error handling agents. @@ -126,7 +126,7 @@ New Features - Various changes to support Clang linker and assembler - - The clang assembler/preprocessor is used when Clang is selected however, + - The clang assembler/preprocessor is used when Clang is selected. However, the clang linker is not used because it is unable to link TF-A objects due to immaturity of clang linker functionality at this time. @@ -213,12 +213,14 @@ New Features - Allwinner sun50i_h6 - - NXP ls1043 + - NXP QorIQ LS1043A - NXP i.MX8QX - NXP i.MX8QM + - NXP i.MX7Solo WaRP7 + - TI K3 - Socionext Synquacer SC2A11 diff --git a/docs/user-guide.rst b/docs/user-guide.rst index 2632329a2e2e59a7400341ca7bdb46051938eaee..f4ef85d2a140f0356be80d283683298cbace3d73 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -521,8 +521,8 @@ Common build options 40 (LOG_LEVEL_INFO) 50 (LOG_LEVEL_VERBOSE) - All log output up to and including the log level is compiled into the build. - The default value is 40 in debug builds and 20 in release builds. + All log output up to and including the selected log level is compiled into + the build. The default value is 40 in debug builds and 20 in release builds. - ``NON_TRUSTED_WORLD_KEY``: This option is used when ``GENERATE_COT=1``. It specifies the file that contains the Non-Trusted World private key in PEM diff --git a/include/common/debug.h b/include/common/debug.h index 8ee55b8828b572a0cdc57139e3767011c56df24c..a14a66e859e1e883dbad1f3f35a820dce26f172d 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -57,18 +57,18 @@ } \ } while (false) -#if LOG_LEVEL >= LOG_LEVEL_NOTICE -# define NOTICE(...) tf_log(LOG_MARKER_NOTICE __VA_ARGS__) -#else -# define NOTICE(...) no_tf_log(LOG_MARKER_NOTICE __VA_ARGS__) -#endif - #if LOG_LEVEL >= LOG_LEVEL_ERROR # define ERROR(...) tf_log(LOG_MARKER_ERROR __VA_ARGS__) #else # define ERROR(...) no_tf_log(LOG_MARKER_ERROR __VA_ARGS__) #endif +#if LOG_LEVEL >= LOG_LEVEL_NOTICE +# define NOTICE(...) tf_log(LOG_MARKER_NOTICE __VA_ARGS__) +#else +# define NOTICE(...) no_tf_log(LOG_MARKER_NOTICE __VA_ARGS__) +#endif + #if LOG_LEVEL >= LOG_LEVEL_WARNING # define WARN(...) tf_log(LOG_MARKER_WARNING __VA_ARGS__) #else diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index ed2c3fbceed47415de35f37150f33622a42c66c1..e218c2f0593cfc677bb23139ce59a3cca6386f44 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -78,7 +78,7 @@ struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/hisilicon/poplar/bl31_plat_setup.c b/plat/hisilicon/poplar/bl31_plat_setup.c index b45693f5ec4f9019e536f91596774ade2d30530d..83803a66adcb36e0af1a554c1290b4075eeda7ed 100644 --- a/plat/hisilicon/poplar/bl31_plat_setup.c +++ b/plat/hisilicon/poplar/bl31_plat_setup.c @@ -61,7 +61,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/layerscape/common/ls_bl31_setup.c b/plat/layerscape/common/ls_bl31_setup.c index 1114a51e876a237d52f74387c14739d7c85c4533..2067b90251b2991a2a240a102d8cbdba96928a9c 100644 --- a/plat/layerscape/common/ls_bl31_setup.c +++ b/plat/layerscape/common/ls_bl31_setup.c @@ -58,7 +58,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to Layerscape platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/marvell/common/marvell_bl31_setup.c b/plat/marvell/common/marvell_bl31_setup.c index 0bbb940f63bc711d69bf86f0e43f7438a8b2b699..da91b56077b052ccc0b7bb2641c8a982c2d33988 100644 --- a/plat/marvell/common/marvell_bl31_setup.c +++ b/plat/marvell/common/marvell_bl31_setup.c @@ -62,7 +62,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /***************************************************************************** * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c index d9577a6fccb528763bda3392daf5d7ffef6462bb..96a0bd83f64f7f0889ff21e6a552d1e8823b6c72 100644 --- a/plat/mediatek/mt6795/bl31_plat_setup.c +++ b/plat/mediatek/mt6795/bl31_plat_setup.c @@ -165,7 +165,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/mediatek/mt8173/bl31_plat_setup.c b/plat/mediatek/mt8173/bl31_plat_setup.c index ce5230963f99e522ece1a19cd483a3f8ba7bfd2c..c27de8295d73894c8fe81649a2e2671de4ee1e6b 100644 --- a/plat/mediatek/mt8173/bl31_plat_setup.c +++ b/plat/mediatek/mt8173/bl31_plat_setup.c @@ -86,7 +86,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/qemu_bl31_setup.c index 8b4312cf0dcaf184be9b1ddd5ae1f1f0f0f7a34b..7542674ec5e9bfbec7bfbbbd2faef4c140bb0958 100644 --- a/plat/qemu/qemu_bl31_setup.c +++ b/plat/qemu/qemu_bl31_setup.c @@ -30,7 +30,7 @@ static entry_point_info_t bl33_image_ep_info; /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before * they are lost (potentially). This needs to be done before the MMU is * initialized so that the memory layout can be used while creating page * tables. BL2 has flushed this information to memory, so we are guaranteed diff --git a/plat/rockchip/common/bl31_plat_setup.c b/plat/rockchip/common/bl31_plat_setup.c index b8ec8c1cb2d0ab119fe5af64266b6a5749ca072e..7a9f7a9d10f740b43c56db4527660633d7d8a49e 100644 --- a/plat/rockchip/common/bl31_plat_setup.c +++ b/plat/rockchip/common/bl31_plat_setup.c @@ -54,7 +54,7 @@ void params_early_setup(void *plat_param_from_bl2) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi3/rpi3_bl31_setup.c index 306f26b3f39d43c55587b169f572e0b239a90550..0ae783e12aa1b438e65cdfa52af72eb8d628f3ca 100644 --- a/plat/rpi3/rpi3_bl31_setup.c +++ b/plat/rpi3/rpi3_bl31_setup.c @@ -47,7 +47,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before * they are lost (potentially). This needs to be done before the MMU is * initialized so that the memory layout can be used while creating page * tables. BL2 has flushed this information to memory, so we are guaranteed diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 02f1811f59ed4d5e2b2d1fad603a4cacfe51146e..a14388f56a147f10652d7a782ae5d2bf8e862be9 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -50,7 +50,7 @@ static inline void bl31_set_default_config(void) /* * Perform any BL31 specific platform actions. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. */