diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2015-10-12 13:48:08 -0500 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 15:20:57 +0100 |
| commit | 7a7281a91c2e0b27bc276ef879e896ed8669342a (patch) | |
| tree | 2fbed57f98ee2a1e29accd0d3ded9cb679ff59fb /arch | |
| parent | fc5ad4778d91dabbeca3bc05a78cb669686f0a9c (diff) | |
| download | u-boot-imx-7a7281a91c2e0b27bc276ef879e896ed8669342a.zip u-boot-imx-7a7281a91c2e0b27bc276ef879e896ed8669342a.tar.gz u-boot-imx-7a7281a91c2e0b27bc276ef879e896ed8669342a.tar.bz2 | |
imx: hab: rework secure boot support for imx6
Rework secure boot support for imx6, move existing hab support
for imx6 into imx-common for SoC reuse.
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/imx-common/hab.c (renamed from arch/arm/cpu/armv7/mx6/hab.c) | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/imx-common/hab.h (renamed from arch/arm/include/asm/arch-mx6/hab.h) | 0 |
4 files changed, 2 insertions, 2 deletions
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 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 index d0eaa67..d0eaa67 100644 --- a/arch/arm/include/asm/arch-mx6/hab.h +++ b/arch/arm/include/asm/imx-common/hab.h |