tools: build mkeficapsule with tools-only_defconfig

Add CONFIG_TOOLS_MKEFICAPSULE. Then we want to always build mkeficapsule
if tools-only_defconfig is used.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index 054e008b2a903e54df2a69c802c89740b22713e9..64eb766515356b180875f288aeed77d9f26904cd 100644 (file)
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -35,3 +35,4 @@ CONFIG_I2C_EDID=y
 # CONFIG_VIRTIO_SANDBOX is not set
 # CONFIG_GENERATE_ACPI_TABLE is not set
 # CONFIG_EFI_LOADER is not set
+CONFIG_TOOLS_MKEFICAPSULE=y

diff --git a/tools/Kconfig b/tools/Kconfig
index 91ce8ae3e5162cd1671dad2a9f87c90256df7d07..117c921da3fe0ea5dcc40196d6cde416dcb9935c 100644 (file)
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -90,4 +90,12 @@ config TOOLS_SHA512
        help
          Enable SHA512 support in the tools builds
 
+config TOOLS_MKEFICAPSULE
+       bool "Build efimkcapsule command"
+       default y if EFI_CAPSULE_ON_DISK
+       help
+         This command allows users to create a UEFI capsule file and,
+         optionally sign that file. If you want to enable UEFI capsule
+         update feature on your target, you certainly need this.
+
 endmenu

diff --git a/tools/Makefile b/tools/Makefile
index 1763f44cac438a0ae1ca275f29fc10cd47e91870..766c0674f4a0f5c4948c19a45fcabd2e719d3704 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -238,8 +238,7 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs
 hostprogs-$(CONFIG_ASN1_COMPILER)      += asn1_compiler
 HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
 
-mkeficapsule-objs      := mkeficapsule.o $(LIBFDT_OBJS)
-hostprogs-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += mkeficapsule
+hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
 
 # We build some files with extra pedantic flags to try to minimize things
 # that won't build on some weird host compiler -- though there are lots of