[PATCH 1/5] scripts: Add Kconfig option for most host tools

[Sascha Hauer]

Host tools were often only compiled depending on the architecture which
needs them. This patch adds explicit options for most tools mainly to
be able to compile test them without having to compile for each
architecture.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 scripts/Kconfig  | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/Makefile | 18 +++++++-------
 2 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/scripts/Kconfig b/scripts/Kconfig
index b903486ecd..5cba520f4b 100644
--- a/scripts/Kconfig
+++ b/scripts/Kconfig
@@ -12,6 +12,69 @@ config COMPILE_HOST_TOOLS
 
 source "scripts/imx/Kconfig"
 
+config SOCFPGA_MKIMAGE
+	bool "SoCFPGA mkimage" if COMPILE_HOST_TOOLS
+	depends on ARCH_SOCFPGA || COMPILE_HOST_TOOLS
+	default y if ARCH_SOCFPGA
+	help
+	  This enables building the image creation tool for SoCFPGA
+
+config ZYNQ_MKIMAGE
+	bool "Zynq mkimage" if COMPILE_HOST_TOOLS
+	depends on ARCH_ZYNQ || COMPILE_HOST_TOOLS
+	default y if ARCH_ZYNQ
+	help
+	  This enables building the image creation tool for Zynq
+
+config MXS_HOSTTOOLS
+	bool "MXS host tools" if COMPILE_HOST_TOOLS
+	depends on ARCH_MXS || COMPILE_HOST_TOOLS
+	default y if ARCH_MXS
+	help
+	  This enables building the host tools for Freescale MXS SoCs
+
+config LAYERSCAPE_PBLIMAGE
+	bool "Layerscape PBL image tool" if COMPILE_HOST_TOOLS
+	depends on ARCH_LAYERSCAPE || COMPILE_HOST_TOOLS
+	default y if ARCH_LAYERSCAPE
+	help
+	  This enables building the PBL image tool for Freescale Layerscape SoCs
+
+config STM32_IMAGE
+	bool "STM32MP image tool" if COMPILE_HOST_TOOLS
+	depends on ARCH_STM32MP || COMPILE_HOST_TOOLS
+	default y if ARCH_STM32MP
+	help
+	  This enables building the image creation tool for STM32MP SoCs
+
+config RK_IMAGE
+	bool "Rockchip image tool" if COMPILE_HOST_TOOLS
+	depends on ARCH_ROCKCHIP || COMPILE_HOST_TOOLS
+	default y if ARCH_ROCKCHIP
+	help
+	  This enables building the image creation tool for Rockchip SoCs
+
+config OMAP_IMAGE
+	bool "TI OMAP image tools" if COMPILE_HOST_TOOLS
+	depends on ARCH_OMAP || COMPILE_HOST_TOOLS
+	default y if ARCH_OMAP
+	help
+	  This enables building the image creation tools for TI OMAP SoCs
+
+config S5P_IMAGE
+	bool "S5P image tool" if COMPILE_HOST_TOOLS
+	depends on ARCH_S5PCxx || COMPILE_HOST_TOOLS
+	default y if ARCH_S5PCxx
+	help
+	  This enables building the image creation tool for S5P SoCs
+
+config DAVINCI_IMAGE
+	bool "Davinci image tool" if COMPILE_HOST_TOOLS
+	depends on ARCH_DAVINCI || COMPILE_HOST_TOOLS
+	default y if ARCH_DAVINCI
+	help
+	  This enables building the image creation tool for Davinci SoCs
+
 config MVEBU_HOSTTOOLS
 	bool "mvebu hosttools" if COMPILE_HOST_TOOLS
 	depends on ARCH_MVEBU || COMPILE_HOST_TOOLS
diff --git a/scripts/Makefile b/scripts/Makefile
index eb0f5c5805..53568573a3 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -15,17 +15,17 @@ hostprogs-always-$(CONFIG_IMD)				+= bareboximd
 hostprogs-always-$(CONFIG_KALLSYMS)			+= kallsyms
 hostprogs-always-$(CONFIG_MIPS)				+= mips-relocs
 hostprogs-always-$(CONFIG_MVEBU_HOSTTOOLS)		+= kwbimage kwboot mvebuimg
-hostprogs-always-$(CONFIG_ARCH_OMAP)			+= omap_signGP mk-omap-image
-hostprogs-always-$(CONFIG_ARCH_S5PCxx)			+= s5p_cksum
-hostprogs-always-$(CONFIG_ARCH_DAVINCI)			+= mkublheader
+hostprogs-always-$(CONFIG_OMAP_IMAGE)			+= omap_signGP mk-omap-image
+hostprogs-always-$(CONFIG_S5P_IMAGE)			+= s5p_cksum
+hostprogs-always-$(CONFIG_DAVINCI_IMAGE)		+= mkublheader
 HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/arch/arm/mach-zynq/include
-hostprogs-always-$(CONFIG_ARCH_ZYNQ)			+= zynq_mkimage
-hostprogs-always-$(CONFIG_ARCH_SOCFPGA)			+= socfpga_mkimage
-hostprogs-always-$(CONFIG_ARCH_MXS)			+= mxsimage mxsboot
-hostprogs-always-$(CONFIG_ARCH_LAYERSCAPE)		+= pblimage
-hostprogs-always-$(CONFIG_ARCH_STM32MP)			+= stm32image
+hostprogs-always-$(CONFIG_ZYNQ_MKIMAGE)			+= zynq_mkimage
+hostprogs-always-$(CONFIG_SOCFPGA_MKIMAGE)		+= socfpga_mkimage
+hostprogs-always-$(CONFIG_MXS_HOSTTOOLS)		+= mxsimage mxsboot
+hostprogs-always-$(CONFIG_LAYERSCAPE_PBLIMAGE)		+= pblimage
+hostprogs-always-$(CONFIG_STM32_IMAGE)			+= stm32image
 hostprogs-always-$(CONFIG_RISCV)			+= prelink-riscv
-hostprogs-always-$(CONFIG_ARCH_ROCKCHIP)		+= rkimage
+hostprogs-always-$(CONFIG_RK_IMAGE)			+= rkimage
 HOSTCFLAGS_rkimage = `pkg-config --cflags openssl`
 HOSTLDLIBS_rkimage = `pkg-config --libs openssl`
 KBUILD_HOSTCFLAGS += -I$(srctree)/scripts/include/
-- 
2.30.2