diff options
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/hab/Makefile | 1 | ||||
| -rw-r--r-- | drivers/hab/habv4.c (renamed from drivers/habv4/habv4.c) | 2 | ||||
| -rw-r--r-- | drivers/habv4/Makefile | 1 | ||||
| -rw-r--r-- | include/hab.h (renamed from include/habv4.h) | 0 |
6 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c713e50216..c5ac90f039 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -695,8 +695,12 @@ config IMX_OCOTP_WRITE mw -l -d /dev/imx-ocotp 0x8C 0x00001234 mw -l -d /dev/imx-ocotp 0x88 0x56789ABC +config HAB + bool + config HABV4 tristate "HABv4 support" + select HAB depends on ARCH_IMX6 help High Assurance Boot, as found on i.MX28/i.MX6. @@ -737,6 +741,7 @@ endif config HABV3 tristate "HABv3 support" + select HAB depends on ARCH_IMX25 help High Assurance Boot, as found on i.MX25. diff --git a/drivers/Makefile b/drivers/Makefile index 3afbb61b2d..8a8c8c44bd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -30,4 +30,4 @@ obj-$(CONFIG_PCI) += pci/ obj-y += rtc/ obj-$(CONFIG_FIRMWARE) += firmware/ obj-$(CONFIG_GENERIC_PHY) += phy/ -obj-$(CONFIG_HABV4) += habv4/ +obj-$(CONFIG_HAB) += hab/ diff --git a/drivers/hab/Makefile b/drivers/hab/Makefile new file mode 100644 index 0000000000..5c3b00c168 --- /dev/null +++ b/drivers/hab/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_HABV4) += habv4.o diff --git a/drivers/habv4/habv4.c b/drivers/hab/habv4.c index 5ace0def2a..8521b88d03 100644 --- a/drivers/habv4/habv4.c +++ b/drivers/hab/habv4.c @@ -19,7 +19,7 @@ #define pr_fmt(fmt) "HABv4: " fmt #include <common.h> -#include <habv4.h> +#include <hab.h> #include <types.h> #include <mach/generic.h> diff --git a/drivers/habv4/Makefile b/drivers/habv4/Makefile deleted file mode 100644 index 40b3253147..0000000000 --- a/drivers/habv4/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += habv4.o diff --git a/include/habv4.h b/include/hab.h index f9bf74f3b9..f9bf74f3b9 100644 --- a/include/habv4.h +++ b/include/hab.h |