diff mbox series

[v2,35/50] image: Drop IMAGE_OF_SYSTEM_SETUP

Message ID	20210506142438.1310977-8-sjg@chromium.org
State	Deferred
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Andre Przywara <andre.przywara@arm.com>, Masahiro Yamada <masahiroy@kernel.org>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Robert Marko <robert.marko@sartura.hr>, Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>, Joe Hershberger <joe.hershberger@ni.com>, Marek Vasut <marex@denx.de> Subject: [PATCH v2 35/50] image: Drop IMAGE_OF_SYSTEM_SETUP Date: Thu, 6 May 2021 08:24:23 -0600 Message-Id: <20210506142438.1310977-8-sjg@chromium.org> In-Reply-To: <20210506142438.1310977-1-sjg@chromium.org> References: <20210506142438.1310977-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	image: Reduce #ifdefs and ad-hoc defines in image code \| expand [v2,00/50] image: Reduce #ifdefs and ad-hoc defines in image code [v2,01/50] lib: Add memdup() [v2,02/50] Add support for an owned buffer [v2,03/50] compiler: Add a comment to host_build() [v2,04/50] zstd: Create a function for use from U-Boot [v2,05/50] btrfs: Use U-Boot API for decompression [v2,06/50] image: Avoid switch default in image_decomp() [v2,07/50] image: Update zstd to avoid reporting error twice [v2,08/50] gzip: Avoid use of u64 [v2,09/50] image: Update image_decomp() to avoid ifdefs [v2,10/50] image: Split board code out into its own file [v2,11/50] image: Fix up checkpatch warnings in image-board.c [v2,12/50] image: Split host code out into its own file [v2,13/50] image: Create a function to do manual relocation [v2,14/50] image: Avoid #ifdefs for manual relocation [v2,15/50] image: Remove ifdefs around image_setup_linux() el at [v2,16/50] image: Add Kconfig options for FIT in the host build [v2,17/50] kconfig: Add host support to CONFIG_IS_ENABLED() [v2,18/50] image: Shorten FIT_ENABLE_SHAxxx_SUPPORT [v2,19/50] image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx [v2,20/50] hash: Use Kconfig to enable hashing in host tools [v2,21/50] hash: Drop some #ifdefs in hash.c [v2,22/50] image: Drop IMAGE_ENABLE_FIT [v2,23/50] image: Drop IMAGE_ENABLE_OF_LIBFDT [v2,24/50] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host [v2,25/50] image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT [v2,26/50] image: Use Kconfig to enable FIT_RSASSA_PSS on host [v2,27/50] Kconfig: Rename SPL_CRC32_SUPPORT to SPL_CRC32 [v2,28/50] image: Drop IMAGE_ENABLE_CRC32 [v2,29/50] Kconfig: Rename SPL_MD5_SUPPORT to SPL_MD5 [v2,30/50] image: Drop IMAGE_ENABLE_MD5 [v2,31/50] image: Drop IMAGE_ENABLE_SHA1 [v2,32/50] image: Drop IMAGE_ENABLE_SHAxxx [v2,33/50] image: Drop IMAGE_BOOT_GET_CMDLINE [v2,34/50] image: Drop IMAGE_OF_BOARD_SETUP [v2,35/50] image: Drop IMAGE_OF_SYSTEM_SETUP [v2,36/50] image: Drop IMAGE_ENABLE_IGNORE [v2,37/50] image: Drop IMAGE_ENABLE_SIGN/VERIFY defines [v2,38/50] image: Drop IMAGE_ENABLE_BEST_MATCH [v2,39/50] image: Drop IMAGE_ENABLE_EN/DECRYPT defines [v2,40/50] image: Tidy up fit_unsupported_reset() [v2,41/50] image: Drop unnecessary #ifdefs from image.h [v2,42/50] image: Drop #ifdefs for fit_print_contents() [v2,43/50] image: Drop most #ifdefs in image-board.c [v2,44/50] image: Reduce variable scope in boot_get_ramdisk() [v2,45/50] image: Split up boot_get_ramdisk() [v2,46/50] image: Remove #ifdefs from select_ramdisk() [v2,47/50] image: Remove some #ifdefs from image-fit and image-fit-sig [v2,48/50] image: Reduce variable scope in boot_get_fdt() [v2,49/50] image: Split up boot_get_fdt() [v2,50/50] image: Remove #ifdefs from select_fdt()

Commit Message

Simon Glass May 6, 2021, 2:24 p.m. UTC

This is not needed with Kconfig, since we can use IS_ENABLED() easily
enough. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 common/image-fdt.c | 2 +-
 include/image.h    | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/common/image-fdt.c b/common/image-fdt.c
index c2d9710bfaa..80bfa625ab2 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -590,7 +590,7 @@  int image_setup_libfdt(bootm_headers_t *images, void *blob,
 			}
 		}
 	}
-	if (IMAGE_OF_SYSTEM_SETUP) {
+	if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) {
 		fdt_ret = ft_system_setup(blob, gd->bd);
 		if (fdt_ret) {
 			printf("ERROR: system-specific fdt fixup failed: %s\n",
diff --git a/include/image.h b/include/image.h
index deb690d168b..eb5ca8a32d3 100644
--- a/include/image.h
+++ b/include/image.h
@@ -49,12 +49,6 @@  struct fdt_region;
 
 #endif /* FIT */
 
-#ifdef CONFIG_OF_SYSTEM_SETUP
-# define IMAGE_OF_SYSTEM_SETUP	1
-#else
-# define IMAGE_OF_SYSTEM_SETUP	0
-#endif
-
 extern ulong image_load_addr;		/* Default Load Address */
 extern ulong image_save_addr;		/* Default Save Address */
 extern ulong image_save_size;		/* Default Save Size */