From: Tom Rini <trini@konsulko.com>
Date: Mon, 22 May 2017 18:15:16 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-sunxi
X-Git-Tag: v2017.07-rc1~193
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=711391131c84398d1b8256ab5a8cfa2969ad57c7;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-sunxi

trini: Make Kconfig SPL_xxx entires only show if SPL, so that we don't
get Kconfig errors on platforms without SPL, ie sandbox (without SPL).

Signed-off-by: Tom Rini <trini@konsulko.com>
---

711391131c84398d1b8256ab5a8cfa2969ad57c7
diff --cc Kconfig
index 1b19b7b76c,8e773b8a86..bb80adacf4
--- a/Kconfig
+++ b/Kconfig
@@@ -220,6 -205,6 +220,8 @@@ config FIT_IMAGE_POST_PROCES
  	  injected into the FIT creation (i.e. the blobs would have been pre-
  	  processed before being added to the FIT image).
  
++if SPL
++
  config SPL_FIT
  	bool "Support Flattened Image Tree within SPL"
  	depends on SPL
@@@ -254,6 -241,24 +258,26 @@@ config SPL_FIT_IMAGE_POST_PROCES
  	  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.
+ 
++endif # SPL
++
  endif # FIT
  
  config OF_BOARD_SETUP