diff options
Diffstat (limited to 'plat/nxp/common/setup')
| -rw-r--r-- | plat/nxp/common/setup/core.mk | 6 | ||||
| -rw-r--r-- | plat/nxp/common/setup/ls_bl31_setup.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/plat/nxp/common/setup/core.mk b/plat/nxp/common/setup/core.mk index 9b81f2d46..82ce30ecd 100644 --- a/plat/nxp/common/setup/core.mk +++ b/plat/nxp/common/setup/core.mk @@ -1,4 +1,4 @@ -# Copyright 2018-2020 NXP +# Copyright 2018-2021 NXP # # SPDX-License-Identifier: BSD-3-Clause # @@ -11,9 +11,11 @@ CPU_LIBS := lib/cpus/${ARCH}/aem_generic.S -ifeq (,$(filter $(CORE_TYPE),a53 a55 a57 a72 a75)) +ifeq (,$(filter $(CORE_TYPE),a53 a72)) $(error "CORE_TYPE not specified or incorrect") else +UPPER_CORE_TYPE=$(shell echo $(CORE_TYPE) | tr a-z A-Z) +$(eval $(call add_define_val,CPUECTLR_EL1,CORTEX_$(UPPER_CORE_TYPE)_ECTLR_EL1)) CPU_LIBS += lib/cpus/${ARCH}/cortex_$(CORE_TYPE).S endif diff --git a/plat/nxp/common/setup/ls_bl31_setup.c b/plat/nxp/common/setup/ls_bl31_setup.c index 6cf6ae36a..bd0ab4fb7 100644 --- a/plat/nxp/common/setup/ls_bl31_setup.c +++ b/plat/nxp/common/setup/ls_bl31_setup.c @@ -6,6 +6,8 @@ */ #include <assert.h> +#include <inttypes.h> +#include <stdint.h> #ifdef LS_EL3_INTERRUPT_HANDLER #include <ls_interrupt_mgmt.h> @@ -126,7 +128,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, loc_dram_regions_info->num_dram_regions; dram_regions_info.total_dram_size = loc_dram_regions_info->total_dram_size; - VERBOSE("Number of DRAM Regions = %llx\n", + VERBOSE("Number of DRAM Regions = %" PRIx64 "\n", dram_regions_info.num_dram_regions); for (i = 0; i < dram_regions_info.num_dram_regions; @@ -135,7 +137,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, loc_dram_regions_info->region[i].addr; dram_regions_info.region[i].size = loc_dram_regions_info->region[i].size; - VERBOSE("DRAM%d Size = %llx\n", i, + VERBOSE("DRAM%d Size = %" PRIx64 "\n", i, dram_regions_info.region[i].size); } rcw_porsr1 = bl31_image_ep_info.args.arg4; |