[iot] Support ARM64 for Trusty OS

Align the callback to ARM64 environment for
Trusty OS.

TEST: AIY-3G & AIY-1G board's TIPC and AVB handler
      works.

Change-Id: I65806f56267a4a9278db04a462e351da181618cc
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

2 files changed, 78 insertions, 2 deletions

diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
new file mode 100644
index 00000000000..e3ee091a2f8
--- /dev/null
+++ b/arch/arm/imx-common/Kconfig
@@ -0,0 +1,78 @@
+config IMX_CONFIG
+	string
+
+config IMX_OPTEE
+	bool "Support OP-TEE"
+	help
+	 Enable support for OP-TEE
+
+config GPT_TIMER
+	bool "Using i.MX GPT timer as system tick timer"
+	depends on ARCH_MX6 || ARCH_MX7
+	help
+	  Enable GPT timer driver for system tick timer on i.MX6 and 
+	  i.MX7.
+
+config ROM_UNIFIED_SECTIONS
+	bool
+
+config IMX_RDC
+	bool "i.MX Resource domain controller driver"
+	depends on ARCH_MX6 || ARCH_MX7
+	help
+	  i.MX Resource domain controller is used to assign masters
+	  and peripherals to differet domains. This can be used to
+	  isolate resources.
+
+config IMX_BOOTAUX
+	bool "Support boot auxiliary core"
+	depends on ARCH_MX7 || ARCH_MX6 || ARCH_IMX8
+	help
+	  bootaux [addr] to boot auxiliary core.
+
+config USE_IMXIMG_PLUGIN
+	bool "Use imximage plugin code"
+	depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP
+	help
+	  i.MX6/7 supports DCD and Plugin. Enable this configuration
+	  to use Plugin, otherwise DCD will be used.
+
+config SECURE_BOOT
+	bool "Support i.MX HAB features"
+	depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M
+	select FSL_CAAM if !MX6ULL && !MX6SLL && !MX6SL && !IMX8M
+	help
+	  This option enables the support for secure boot (HAB).
+	  See doc/README.mxc_hab for more details.
+
+config FSL_MFGPROT
+	bool "Support the 'mfgprot' command"
+	depends on SECURE_BOOT && ARCH_MX7
+	help
+	  This option enables the manufacturing protection command
+	  which can be used has a protection feature for Manufacturing
+	  process. With this tool is possible to authenticate the
+	  chip to the OEM's server.
+
+config DBG_MONITOR
+	bool "Enable the AXI debug monitor"
+	depends on ARCH_MX6 || ARCH_MX7
+	help
+	  This option enables the debug monitor which prints out last 
+	  failed AXI access info when system reboot is caused by AXI 
+	  access failure.
+
+config IMX_M4_BIND
+	bool "Bind ULP M4 image to final u-boot"
+	depends on ARCH_MX7ULP
+	help
+	  Select this to bind a ULP M4 image to final u-boot image
+	  User needs put the M4 image ulp_m4.bin under u-boot directory
+
+config IMX_TRUSTY_OS
+	bool "Support Trusty OS related feature"
+	depends on ARCH_MX6 || ARCH_MX7 || ARCH_IMX8 || ARCH_IMX8M
+	select SYS_ARM_CACHE_WRITEALLOC
+
+config SYS_ARM_CACHE_WRITEALLOC
+	bool "support cache write alloc"
diff --git a/lib/avb/fsl/fsl_avbkey.c b/lib/avb/fsl/fsl_avbkey.c
index 097e00dd82b..50265d6f7af 100644
--- a/lib/avb/fsl/fsl_avbkey.c
+++ b/lib/avb/fsl/fsl_avbkey.c
@@ -47,7 +47,6 @@
 #define RESULT_ERROR -1
 #define RESULT_OK     0
 
-
 #ifndef CONFIG_SPL_BUILD
 #if defined(CONFIG_AVB_ATX) && !defined(CONFIG_ARM64)
 static int fsl_fuse_ops(uint32_t *buffer, uint32_t length, uint32_t offset,
@@ -1338,7 +1337,6 @@ fail:
 #endif /* CONFIG_SPL_BUILD */
 #endif /* AVB_RPMB */
 
-
 #if defined(AVB_RPMB) && defined(CONFIG_AVB_ATX) && !defined(CONFIG_SPL_BUILD)
 /* Provides the key version of a key used during verification. This may be
  * useful for managing the minimum key version.