diff options
-rw-r--r-- | arch/arm/include/asm/arch-mx6/hab.h | 4 | ||||
-rw-r--r-- | board/freescale/mx6sx_17x17_arm2/imximage.cfg | 2 | ||||
-rw-r--r-- | board/freescale/mx6sx_19x19_arm2/imximage.cfg | 2 | ||||
-rw-r--r-- | board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg | 2 | ||||
-rw-r--r-- | board/freescale/mx6sxsabresd/imximage.cfg | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-mx6/hab.h b/arch/arm/include/asm/arch-mx6/hab.h index dc0f4ca..2cd402b 100644 --- a/arch/arm/include/asm/arch-mx6/hab.h +++ b/arch/arm/include/asm/arch-mx6/hab.h @@ -70,6 +70,8 @@ typedef void hapi_clock_init_t(void); #define HAB_RVT_ENTRY (*(uint32_t *) 0x00000098) #define HAB_RVT_EXIT (*(uint32_t *) 0x0000009C) +#endif + #define HAB_RVT_REPORT_EVENT_NEW (*(uint32_t *) 0x000000B8) #define HAB_RVT_REPORT_STATUS_NEW (*(uint32_t *) 0x000000BC) #define HAB_RVT_AUTHENTICATE_IMAGE_NEW (*(uint32_t *) 0x000000A8) @@ -78,8 +80,6 @@ typedef void hapi_clock_init_t(void); #define HAB_RVT_CLOCK_INIT ((hapi_clock_init_t *)0x0000024D) -#endif - #define HAB_CID_ROM 0 /**< ROM Caller ID */ #define HAB_CID_UBOOT 1 /**< UBOOT Caller ID*/ /* ----------- end of HAB API updates ------------*/ diff --git a/board/freescale/mx6sx_17x17_arm2/imximage.cfg b/board/freescale/mx6sx_17x17_arm2/imximage.cfg index 7152fb3..d8bbeb0 100644 --- a/board/freescale/mx6sx_17x17_arm2/imximage.cfg +++ b/board/freescale/mx6sx_17x17_arm2/imximage.cfg @@ -33,7 +33,7 @@ PLUGIN board/freescale/mx6sx_17x17_arm2/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT -SECURE_BOOT +CSF 0x2000 #endif /* diff --git a/board/freescale/mx6sx_19x19_arm2/imximage.cfg b/board/freescale/mx6sx_19x19_arm2/imximage.cfg index d070c1b..613a916 100644 --- a/board/freescale/mx6sx_19x19_arm2/imximage.cfg +++ b/board/freescale/mx6sx_19x19_arm2/imximage.cfg @@ -35,7 +35,7 @@ PLUGIN board/freescale/mx6sx_19x19_arm2/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT -SECURE_BOOT +CSF 0x2000 #endif /* diff --git a/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg b/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg index 3d0deb3..9f5c883 100644 --- a/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg +++ b/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg @@ -35,7 +35,7 @@ PLUGIN board/freescale/mx6sx_19x19_arm2/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT -SECURE_BOOT +CSF 0x2000 #endif /* diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg index 213766f..df672da 100644 --- a/board/freescale/mx6sxsabresd/imximage.cfg +++ b/board/freescale/mx6sxsabresd/imximage.cfg @@ -33,7 +33,7 @@ PLUGIN board/freescale/mx6sxsabresd/plugin.bin 0x00907000 #else #ifdef CONFIG_SECURE_BOOT -SECURE_BOOT +CSF 0x2000 #endif /* |