diff options
author | Jiafei Pan <Jiafei.Pan@nxp.com> | 2021-07-20 14:54:01 +0800 |
---|---|---|
committer | Jiafei Pan <Jiafei.Pan@nxp.com> | 2021-08-25 09:53:20 +0800 |
commit | 64cadc163721ee471ab83bb89e35a7fe54d119c2 (patch) | |
tree | feab05ea73a34a28cceb12b46d2785ccc76f4767 /plat | |
parent | 19ebec9f667426c62420f759ebe363125703d3f2 (diff) | |
download | arm-trusted-firmware-64cadc163721ee471ab83bb89e35a7fe54d119c2.tar.gz |
refactor(plat/soc-lx2160): move errata to common directory
Will add more Erratas, some errata can be used for multiple
platforms, so move errata to be common code which can
be share between different platforms.
Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
Change-Id: Ib149b3eac365bdb593331e9f38f0b89d92c9c0d1
Diffstat (limited to 'plat')
-rw-r--r-- | plat/nxp/common/soc_errata/errata.c (renamed from plat/nxp/soc-lx2160a/erratas_soc.c) | 2 | ||||
-rw-r--r-- | plat/nxp/common/soc_errata/errata.mk | 22 | ||||
-rw-r--r-- | plat/nxp/soc-lx2160a/erratas_soc.mk | 21 | ||||
-rw-r--r-- | plat/nxp/soc-lx2160a/soc.mk | 2 |
4 files changed, 24 insertions, 23 deletions
diff --git a/plat/nxp/soc-lx2160a/erratas_soc.c b/plat/nxp/common/soc_errata/errata.c index 8f3aa9f41..958cb3944 100644 --- a/plat/nxp/soc-lx2160a/erratas_soc.c +++ b/plat/nxp/common/soc_errata/errata.c @@ -415,4 +415,4 @@ void erratum_a050426(void) mmio_write_32(0x700117E60, val3); mmio_write_32(0x700117E90, val4); } -#endif +#endif /* ERRATA_SOC_A050426 */ diff --git a/plat/nxp/common/soc_errata/errata.mk b/plat/nxp/common/soc_errata/errata.mk new file mode 100644 index 000000000..ce14825b6 --- /dev/null +++ b/plat/nxp/common/soc_errata/errata.mk @@ -0,0 +1,22 @@ +# +# Copyright 2021 NXP +# +# SPDX-License-Identifier: BSD-3-Clause +# +# Platform Errata Build flags. +# These should be enabled by the platform if the erratum workaround needs to be +# applied. + +ERRATA := \ + ERRATA_SOC_A050426 + +define add_errata_define + $(1) ?= 0 + ifeq ($$($(1)),1) + $$(eval $$(call add_define,$(1))) + endif +endef + +$(foreach e,$(ERRATA),$(eval $(call add_errata_define,$(e)))) + +BL2_SOURCES += $(PLAT_COMMON_PATH)/soc_errata/errata.c diff --git a/plat/nxp/soc-lx2160a/erratas_soc.mk b/plat/nxp/soc-lx2160a/erratas_soc.mk deleted file mode 100644 index 07bed0385..000000000 --- a/plat/nxp/soc-lx2160a/erratas_soc.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright 2020 NXP -# -# SPDX-License-Identifier: BSD-3-Clause -# -# Platform Errata Build flags. -# These should be enabled by the platform if the erratum workaround needs to be -# applied. - -# Flag to apply erratum 50426 workaround during reset. -ERRATA_SOC_A050426 ?= 0 - -# Process ERRATA_SOC_A050426 flag -ifeq (${ERRATA_SOC_A050426}, 1) -INCL_SOC_ERRATA_SOURCES := yes -$(eval $(call add_define,ERRATA_SOC_A050426)) -endif - -ifeq (${INCL_SOC_ERRATA_SOURCES},yes) -BL2_SOURCES += ${PLAT_SOC_PATH}/erratas_soc.c -endif diff --git a/plat/nxp/soc-lx2160a/soc.mk b/plat/nxp/soc-lx2160a/soc.mk index 8ab143083..35da225ce 100644 --- a/plat/nxp/soc-lx2160a/soc.mk +++ b/plat/nxp/soc-lx2160a/soc.mk @@ -138,7 +138,7 @@ endif include ${PLAT_DRIVERS_PATH}/drivers.mk # Adding SoC specific files -include ${PLAT_SOC_PATH}/erratas_soc.mk +include ${PLAT_COMMON_PATH}/soc_errata/errata.mk PLAT_INCLUDES += ${NV_STORAGE_INCLUDES}\ ${WARM_RST_INCLUDES} |