diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2022-01-23 00:30:29 +0000 |
|---|---|---|
| committer | Andre Przywara <andre.przywara@arm.com> | 2022-02-04 00:09:57 +0000 |
| commit | f2c33699d1b029438ccaa154d03d632dd80aac11 (patch) | |
| tree | 3abbf201858a08834706a66556d6fae5eab59c15 | |
| parent | b8cd7f439aa95df9509550c722c4e21e6b218d34 (diff) | |
| download | u-boot-f2c33699d1b029438ccaa154d03d632dd80aac11.zip u-boot-f2c33699d1b029438ccaa154d03d632dd80aac11.tar.gz u-boot-f2c33699d1b029438ccaa154d03d632dd80aac11.tar.bz2 | |
sunxi-common.h: remove pointless #ifdefs
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@sholland.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
| -rw-r--r-- | include/configs/sunxi-common.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 7260eb7..01c3cfc 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -93,13 +93,9 @@ #endif /* mmc config */ -#ifdef CONFIG_MMC #define CONFIG_MMC_SUNXI_SLOT 0 -#endif #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 @@ #endif #define CONFIG_SYS_MMC_MAX_DEVICE 4 -#endif /* * Miscellaneous configurable options @@ -124,8 +119,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ -#define CONFIG_SPL_BOARD_LOAD_IMAGE - /* * We cannot use expressions here, because expressions won't be evaluated in * autoconf.mk. |