From 89031de1320fb4c9aaefd4297dbfd9161787470a Mon Sep 17 00:00:00 2001
From: Joseph Chen <chenjh@rock-chips.com>
Date: Tue, 26 Jan 2021 20:49:21 +0800
Subject: [PATCH] Kconfig: Add CONFIG_FIT dependent for fit image generation

It's possible that we don't need SPL if we set CONFIG_ARM64_BOOT_AARCH32=y,
but uboot.img with FIT format is still required to be generated.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5330f58f9ca5a18a119bdcbfd4e9e716a69b1131
---
 Kconfig | 64 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/Kconfig b/Kconfig
index 1345a0671c..05aa539ccc 100644
--- a/Kconfig
+++ b/Kconfig
@@ -317,44 +317,12 @@ config SPL_FIT_IMAGE_POST_PROCESS
 	  injected into the FIT creation (i.e. the blobs would have been pre-
 	  processed before being added to the FIT image).
 
-config SPL_FIT_SOURCE
-	string ".its source file for U-Boot FIT image"
-	depends on SPL_FIT
-	help
-	  Specifies a (platform specific) FIT source file to generate the
-	  U-Boot FIT image. This could specify further image to load and/or
-	  execute.
-
-config SPL_FIT_GENERATOR
-	string ".its file generator script for U-Boot FIT image"
-	depends on SPL_FIT
-	default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
-	help
-	  Specifies a (platform specific) script file to generate the FIT
-	  source file used to build the U-Boot FIT image file. This gets
-	  passed a list of supported device tree file stub names to
-	  include in the generated image.
-
 config SPL_FIT_HW_CRYPTO
 	bool "Enable SPL hardware crypto for FIT image checksum and rsa verify"
 	depends on SPL_DM_CRYPTO
 	help
 	  Enable SPL hardware crypto for FIT image checksum and rsa verify.
 
-config SPL_FIT_IMAGE_KB
-	int "SPL FIT image size in KiB"
-	depends on SPL_FIT
-	default 2048
-	help
-	  SPL FIT image size in KiB, default 2048KB = 1024KB(u-boot) + 1024KB(tee/atf + others).
-
-config SPL_FIT_IMAGE_MULTIPLE
-	int "SPL FIT image multiple number"
-	depends on SPL_FIT
-	default 2
-	help
-	  SPL FIT image multiple number.
-
 config SPL_SYS_DCACHE_OFF
 	bool "Disable SPL dcache"
 	default y
@@ -364,6 +332,38 @@ config SPL_SYS_DCACHE_OFF
 
 endif # SPL
 
+config SPL_FIT_SOURCE
+	string ".its source file for U-Boot FIT image"
+	depends on SPL_FIT || FIT
+	help
+	  Specifies a (platform specific) FIT source file to generate the
+	  U-Boot FIT image. This could specify further image to load and/or
+	  execute.
+
+config SPL_FIT_GENERATOR
+	string ".its file generator script for U-Boot FIT image"
+	depends on SPL_FIT || FIT
+	default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
+	help
+	  Specifies a (platform specific) script file to generate the FIT
+	  source file used to build the U-Boot FIT image file. This gets
+	  passed a list of supported device tree file stub names to
+	  include in the generated image.
+
+config SPL_FIT_IMAGE_KB
+	int "SPL FIT image size in KiB"
+	depends on SPL_FIT || FIT
+	default 2048
+	help
+	  SPL FIT image size in KiB, default 2048KB = 1024KB(u-boot) + 1024KB(tee/atf + others).
+
+config SPL_FIT_IMAGE_MULTIPLE
+	int "SPL FIT image multiple number"
+	depends on SPL_FIT || FIT
+	default 2
+	help
+	  SPL FIT image multiple number.
+
 endif # FIT
 
 config OF_BOARD_SETUP