diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-15 18:11:18 +1300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-27 15:04:31 +1300 |
| commit | 529d5f96cf7be9ae60db1a5f1c2a2aa0a3d5d26d (patch) | |
| tree | bf7a278db2140115a37d256a277fdd6c2c38c4d3 /drivers | |
| parent | b3b60f59124a1f4fdcee5b7eff3f057e33cfa4c7 (diff) | |
| download | u-boot-529d5f96cf7be9ae60db1a5f1c2a2aa0a3d5d26d.zip u-boot-529d5f96cf7be9ae60db1a5f1c2a2aa0a3d5d26d.tar.gz u-boot-529d5f96cf7be9ae60db1a5f1c2a2aa0a3d5d26d.tar.bz2 | |
cpu: Rename SPL_CPU_SUPPORT to SPL_CPU
The _SUPPORT suffix is from an earlier time and interferes with use of
the CONFIG_IS_ENABLED() macro. Rename the option to drop the suffix.
Tidy up the TODO that prompted this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/timer/timer-uclass.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index c562a71..3510dab 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -38,7 +38,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_SPL_CACHE_SUPPORT) += cache/ -obj-$(CONFIG_SPL_CPU_SUPPORT) += cpu/ +obj-$(CONFIG_SPL_CPU) += cpu/ obj-$(CONFIG_SPL_CRYPTO_SUPPORT) += crypto/ obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/ diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 6f00a5d..73b4a5c 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -83,11 +83,7 @@ static int timer_post_probe(struct udevice *dev) return 0; } -/* - * TODO: should be CONFIG_IS_ENABLED(CPU), but the SPL config has _SUPPORT on - * the end... - */ -#if defined(CONFIG_CPU) || defined(CONFIG_SPL_CPU_SUPPORT) +#if CONFIG_IS_ENABLED(CPU) int timer_timebase_fallback(struct udevice *dev) { struct udevice *cpu; |