[U-Boot] [PATCH v2 2/5] imx: hab: rework support for imx6/imx7

[Stefano Babic <sbabic@denx.de>]

Hi Adrian,

On 30/09/2015 23:30, Adrian Alonso wrote:
> Rework secure boot support for imx6 and imx7
> Move existing hab support for imx6 into imx-common for SoC
> reuse.
> 

Message is reused from V1 - but patch only moves code into imx-common
without doing anything for i.mx7. Please fix the commit message.

> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
> ---
> Changes for V2: Split patch
> - Move existing hab mx6 into common location
> - Update include hab header location
> 
>  arch/arm/cpu/armv7/mx6/Makefile                     | 1 -
>  arch/arm/imx-common/Makefile                        | 1 +
>  arch/arm/{cpu/armv7/mx6 => imx-common}/hab.c        | 2 +-
>  arch/arm/include/asm/{arch-mx6 => imx-common}/hab.h | 0
>  4 files changed, 2 insertions(+), 2 deletions(-)
>  rename arch/arm/{cpu/armv7/mx6 => imx-common}/hab.c (99%)
>  rename arch/arm/include/asm/{arch-mx6 => imx-common}/hab.h (100%)
> 
> diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
> index bf6effc..8af191d 100644
> --- a/arch/arm/cpu/armv7/mx6/Makefile
> +++ b/arch/arm/cpu/armv7/mx6/Makefile
> @@ -9,5 +9,4 @@
>  
>  obj-y	:= soc.o clock.o
>  obj-$(CONFIG_SPL_BUILD)	     += ddr.o
> -obj-$(CONFIG_SECURE_BOOT)    += hab.o
>  obj-$(CONFIG_MP)             += mp.o
> diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
> index 1698d06..4abffee 100644
> --- a/arch/arm/imx-common/Makefile
> +++ b/arch/arm/imx-common/Makefile
> @@ -27,6 +27,7 @@ ifeq ($(SOC),$(filter $(SOC),mx6 mx7))
>  obj-y 	+= cache.o init.o
>  obj-$(CONFIG_CMD_SATA) += sata.o
>  obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
> +obj-$(CONFIG_SECURE_BOOT)    += hab.o
>  endif
>  ifeq ($(SOC),$(filter $(SOC),vf610))
>  obj-y += ddrmc-vf610.o
> diff --git a/arch/arm/cpu/armv7/mx6/hab.c b/arch/arm/imx-common/hab.c
> similarity index 99%
> rename from arch/arm/cpu/armv7/mx6/hab.c
> rename to arch/arm/imx-common/hab.c
> index 27cabe4..9ee0f12 100644
> --- a/arch/arm/cpu/armv7/mx6/hab.c
> +++ b/arch/arm/imx-common/hab.c
> @@ -7,9 +7,9 @@
>  #include <common.h>
>  #include <asm/io.h>
>  #include <asm/system.h>
> -#include <asm/arch/hab.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/sys_proto.h>
> +#include <asm/imx-common/hab.h>
>  
>  /* -------- start of HAB API updates ------------*/
>  
> diff --git a/arch/arm/include/asm/arch-mx6/hab.h b/arch/arm/include/asm/imx-common/hab.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-mx6/hab.h
> rename to arch/arm/include/asm/imx-common/hab.h
> 

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================