imx: hab: use unified rom section for mx6sx and mx6ul

Add CONFIG_ROM_UNIFIED_SECTIONS for mx6sx and mx6ul target
platforms to resolve corresponding HAB_RVT_BASE base address,
the RVT table contains pointers to the HAB API functions in
ROM code.

Signed-off-by: Adrian Alonso <aalonso@freescale.com>

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 0b02e9e77807ce33ae62ac0180d052a8a166b198..273e209cbb14d27f6dc5f5b271960202045455c5 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -23,10 +23,12 @@ config MX6SL
        bool
 
 config MX6SX
+       select ROM_UNIFIED_SECTIONS
        bool
 
 config MX6UL
        select SYS_L2CACHE_OFF
+       select ROM_UNIFIED_SECTIONS
        bool
 
 choice

diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig
index 37b375249d48ce63dfee565c7a51cdccdf43d2d0..2296239226a6e0cc2c10807d92c5767787892fa2 100644 (file)
--- a/arch/arm/imx-common/Kconfig
+++ b/arch/arm/imx-common/Kconfig
@@ -1,2 +1,5 @@
 config IMX_CONFIG
        string
+
+config ROM_UNIFIED_SECTIONS
+       bool

diff --git a/arch/arm/include/asm/imx-common/hab.h b/arch/arm/include/asm/imx-common/hab.h
index d0eaa67180dfbef3c51c36cd82adfdbc8996337d..af77d45b6c2e91f08c4ab2c845fc93da548e03f7 100644 (file)
--- a/arch/arm/include/asm/imx-common/hab.h
+++ b/arch/arm/include/asm/imx-common/hab.h
@@ -113,7 +113,7 @@ typedef void hapi_clock_init_t(void);
 #define HAB_ENG_RTL            0x77   /* RTL simulation engine */
 #define HAB_ENG_SW             0xff   /* Software engine */
 
-#ifdef CONFIG_MX6SX
+#ifdef CONFIG_ROM_UNIFIED_SECTIONS
 #define HAB_RVT_BASE                   0x00000100
 #else
 #define HAB_RVT_BASE                   0x00000094