Revert "Merge patch series "vbe: Series part E""

This reverts commit 1fdf53ace13f745fe8ad4d2d4e79eed98088d555, reversing
changes made to e5aef1bbf11412eebd4c242b46adff5301353c30.

I had missed that this caused too much size growth on rcar3_salvator-x.

Signed-off-by: Tom Rini <[email protected]>

1 files changed, 1 insertions, 70 deletions

diff --git a/boot/Kconfig b/boot/Kconfig
index 20935a269c6..99dcedcc840 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -163,18 +163,6 @@ config SPL_FIT
 	select SPL_HASH
 	select SPL_OF_LIBFDT
 
-config VPL_FIT
-	bool "Support Flattened Image Tree within VPL"
-	depends on VPL
-	select VPL_HASH
-	select VPL_OF_LIBFDT
-
-config TPL_FIT
-	bool "Support Flattened Image Tree within TPL"
-	depends on TPL
-	select TPL_HASH
-	select TPL_OF_LIBFDT
-
 config SPL_FIT_PRINT
 	bool "Support FIT printing within SPL"
 	depends on SPL_FIT
@@ -280,28 +268,6 @@ config SPL_LOAD_FIT_FULL
 	  particular it can handle selecting from multiple device tree
 	  and passing the correct one to U-Boot.
 
-config TPL_LOAD_FIT
-	bool "Enable TPL loading U-Boot as a FIT (basic fitImage features)"
-	depends on TPL
-	select TPL_FIT
-	help
-	  Normally with the SPL framework a legacy image is generated as part
-	  of the build. This contains U-Boot along with information as to
-	  where it should be loaded. This option instead enables generation
-	  of a FIT (Flat Image Tree) which provides more flexibility. In
-	  particular it can handle selecting from multiple device tree
-	  and passing the correct one to U-Boot.
-
-	  This path has the following limitations:
-
-	  1. "loadables" images, other than FDTs, which do not have a "load"
-	     property will not be loaded. This limitation also applies to FPGA
-	     images with the correct "compatible" string.
-	  2. For FPGA images, the supported "compatible" list is in the
-	     doc/uImage.FIT/source_file_format.txt.
-	  3. FDTs are only loaded for images with an "os" property of "u-boot".
-	     "linux" images are also supported with Falcon boot mode.
-
 config SPL_FIT_IMAGE_POST_PROCESS
 	bool "Enable post-processing of FIT artifacts after loading by the SPL"
 	depends on SPL_LOAD_FIT
@@ -326,22 +292,6 @@ config VPL_FIT
 	select VPL_HASH
 	select VPL_OF_LIBFDT
 
-config VPL_LOAD_FIT
-	bool "Enable VPL loading U-Boot as a FIT (basic fitImage features)"
-	select VPL_FIT
-	default y
-
-config VPL_LOAD_FIT_FULL
-	bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
-	select VPL_FIT
-	help
-	  Normally with the SPL framework a legacy image is generated as part
-	  of the build. This contains U-Boot along with information as to
-	  where it should be loaded. This option instead enables generation
-	  of a FIT (Flat Image Tree) which provides more flexibility. In
-	  particular it can handle selecting from multiple device tree
-	  and passing the correct one to U-Boot.
-
 config VPL_FIT_PRINT
 	bool "Support FIT printing within VPL"
 	depends on VPL_FIT
@@ -670,15 +620,6 @@ config VPL_BOOTMETH_VBE
 	  supports selection of various firmware components, selection of an OS to
 	  boot as well as updating these using fwupd.
 
-config TPL_BOOTMETH_VBE
-	bool "Bootdev support for Verified Boot for Embedded (TPL)"
-	depends on TPL
-	default y
-	help
-	  Enables support for VBE boot. This is a standard boot method which
-	  supports selection of various firmware components, seleciton of an OS to
-	  boot as well as updating these using fwupd.
-
 if BOOTMETH_VBE
 
 config BOOTMETH_VBE_REQUEST
@@ -704,8 +645,6 @@ config SPL_BOOTMETH_VBE_REQUEST
 config BOOTMETH_VBE_SIMPLE
 	bool "Bootdev support for VBE 'simple' method"
 	default y
-	imply SPL_CRC8 if SPL
-	imply VPL_CRC8 if VPL
 	help
 	  Enables support for VBE 'simple' boot. This allows updating a single
 	  firmware image in boot media such as MMC. It does not support any sort
@@ -759,15 +698,7 @@ config VPL_BOOTMETH_VBE_SIMPLE_FW
 	  This option enabled for VPL, since it is the phase where the SPL
 	  decision is made.
 
-config TPL_BOOTMETH_VBE_SIMPLE_FW
-	bool "Bootdev support for VBE 'simple' method firmware phase (TPL)"
-	depends on VPL
-	default y
-	help
-	  Enables support for the firmware parts of VBE 'simple' boot, in TPL.
-	  TPL loads a FIT containing the VPL binary and a suitable devicetree.
-
-endif # BOOTMETH_VBE_SIMPLE
+endif # BOOTMETH_VBE
 
 config EXPO
 	bool "Support for expos - groups of scenes displaying a UI"