[PATCH v2 5/5] sunxi-common.h: remove pointless #ifdefs

Andre Przywara andre.przywara at arm.com
Tue Feb 1 02:41:16 CET 2022

Remove some pointless #ifdefs from this file, as there are quite too
many of them already.

Some definitions don't really hurt to have in any case, so remove the
pointless CONFIG_MMC guard around CONFIG_MMC_SUNXI_SLOT.

The BOARD_SIZE_LIMIT applies regardless of ARM64 or not (now), so remove
that guard as well. The maximum number of MMC devices does not depend on
CONFIG_ENV_IS_IN_MMC, so move that out to simplify the file.

Last but not least CONFIG_SPL_BOARD_LOAD_IMAGE serves no real purpose
anymore: it's unconditionally defined for all sunxi boards, and protects
nothing applicable outside of sunxi code anymore. Just remove it.

Reviewed-by: Samuel Holland <samuel at sholland.org>
Reviewed-by: Simon Glass <sjg at chromium.org>
Tested-by: Simon Glass <sjg at chromium.org>
Signed-off-by: Andre Przywara <andre.przywara at arm.com>
 include/configs/sunxi-common.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 7260eb72a40..01c3cfced20 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -93,13 +93,9 @@
 /* mmc config */
-#ifdef CONFIG_MMC
 #if defined(CONFIG_ENV_IS_IN_MMC)
-#ifdef CONFIG_ARM64
  * This is actually (CONFIG_ENV_OFFSET -
  * (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)), but the value will be used
@@ -109,7 +105,6 @@
  * Miscellaneous configurable options
@@ -124,8 +119,6 @@
 #define CONFIG_SYS_MONITOR_LEN		(768 << 10)	/* 768 KiB */
  * We cannot use expressions here, because expressions won't be evaluated in
  * autoconf.mk.

More information about the U-Boot mailing list