summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-06-01 12:01:40 +0800
committerYe.Li <B37916@freescale.com>2015-06-01 13:46:17 +0800
commit68824c13c3606e9400c1a302ba38c009e915a64d (patch)
tree2da7e869b92aed8e50615736883c70e0bac633ea /arch/arm
parent6f3fa2b6363df6a0fd348d45045e4b213c81aab7 (diff)
downloadu-boot-imx-68824c13c3606e9400c1a302ba38c009e915a64d.zip
u-boot-imx-68824c13c3606e9400c1a302ba38c009e915a64d.tar.gz
u-boot-imx-68824c13c3606e9400c1a302ba38c009e915a64d.tar.bz2
MLK-11008 imx: HAB: Fix secure boot configuration and build issue
1. There is conflict when building secure boot, because some common codes for MPC are included by using same configuration. So modify the makefile to get rid of them. 2. The 6UL arch config is missed in hab.h. Fix this issue by using the CONFIG_ROM_UNIFIED_SECTIONS. Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-mx6/hab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/hab.h b/arch/arm/include/asm/arch-mx6/hab.h
index 57f6cba..38d817a 100644
--- a/arch/arm/include/asm/arch-mx6/hab.h
+++ b/arch/arm/include/asm/arch-mx6/hab.h
@@ -53,7 +53,7 @@ typedef void *hab_rvt_authenticate_image_t(uint8_t, ptrdiff_t,
void **, size_t *, hab_loader_callback_f_t);
typedef void hapi_clock_init_t(void);
-#if defined(CONFIG_MX6SX)
+#ifdef CONFIG_ROM_UNIFIED_SECTIONS
#define HAB_RVT_BASE 0x00000100
#else
#define HAB_RVT_BASE 0x00000094