brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Simon Glass 2021-03-15 18:11:18 +13:00
parent b3b60f5912
commit 529d5f96cf
10 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/riscv/cpu/ax25/Kconfig
View File

@ -6,7 +6,7 @@ config RISCV_NDS
imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)
imply ANDES_PLIC if (RISCV_MMODE || SPL_RISCV_MMODE) imply ANDES_PLIC if (RISCV_MMODE || SPL_RISCV_MMODE)
imply ANDES_PLMT_TIMER if (RISCV_MMODE || SPL_RISCV_MMODE) imply ANDES_PLMT_TIMER if (RISCV_MMODE || SPL_RISCV_MMODE)
imply SPL_CPU_SUPPORT imply SPL_CPU
imply SPL_OPENSBI imply SPL_OPENSBI
imply SPL_LOAD_FIT imply SPL_LOAD_FIT
help help

2
arch/riscv/cpu/fu540/Kconfig
View File

@ -13,7 +13,7 @@ config SIFIVE_FU540
imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)
imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE) imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE)
imply CMD_CPU imply CMD_CPU
imply SPL_CPU_SUPPORT imply SPL_CPU
imply SPL_OPENSBI imply SPL_OPENSBI
imply SPL_LOAD_FIT imply SPL_LOAD_FIT
imply SMP imply SMP

2
arch/riscv/cpu/generic/Kconfig
View File

@ -10,6 +10,6 @@ config GENERIC_RISCV
imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)
imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE) imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE)
imply CMD_CPU imply CMD_CPU
imply SPL_CPU_SUPPORT imply SPL_CPU
imply SPL_OPENSBI imply SPL_OPENSBI
imply SPL_LOAD_FIT imply SPL_LOAD_FIT

2
arch/x86/lib/spl.c
View File

@ -96,7 +96,7 @@ static int x86_spl_init(void)
} }
#endif #endif
preloader_console_init(); preloader_console_init();
#ifndef CONFIG_TPL #if !defined(CONFIG_TPL) && !CONFIG_IS_ENABLED(CPU)
ret = print_cpuinfo(); ret = print_cpuinfo();
if (ret) { if (ret) {
debug("%s: print_cpuinfo() failed\n", __func__); debug("%s: print_cpuinfo() failed\n", __func__);

2
common/spl/Kconfig
View File

@ -500,7 +500,7 @@ config SPL_CACHE_SUPPORT
future requests for that data can be served faster. Enable this option future requests for that data can be served faster. Enable this option
to build the drivers in drivers/cache as part of an SPL build. to build the drivers in drivers/cache as part of an SPL build.
config SPL_CPU_SUPPORT config SPL_CPU
bool "Support CPU drivers" bool "Support CPU drivers"
help help
Enable this to support CPU drivers in SPL. These drivers can set Enable this to support CPU drivers in SPL. These drivers can set

2
configs/chromebook_coral_defconfig
View File

@ -43,7 +43,7 @@ CONFIG_BLOBLIST_ADDR=0x100000
CONFIG_HANDOFF=y CONFIG_HANDOFF=y
CONFIG_TPL_SYS_MALLOC_SIMPLE=y CONFIG_TPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_CPU=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_PCI=y CONFIG_SPL_PCI=y
# CONFIG_SPL_SPI_FLASH_TINY is not set # CONFIG_SPL_SPI_FLASH_TINY is not set

2
configs/chromebook_link64_defconfig
View File

@ -31,7 +31,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_CPU=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y

2
configs/qemu-x86_64_defconfig
View File

@ -31,7 +31,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y CONFIG_LAST_STAGE_INIT=y
CONFIG_PCI_INIT_R=y CONFIG_PCI_INIT_R=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_CPU=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y

2
drivers/Makefile
View File

@ -38,7 +38,7 @@ ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_SPL_BOOTCOUNT_LIMIT) += bootcount/
obj-$(CONFIG_SPL_CACHE_SUPPORT) += cache/ 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_CRYPTO_SUPPORT) += crypto/
obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/
obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/ obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/

6
drivers/timer/timer-uclass.c
View File

@ -83,11 +83,7 @@ static int timer_post_probe(struct udevice *dev)
return 0; return 0;
} }
/* #if CONFIG_IS_ENABLED(CPU)
* 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)
int timer_timebase_fallback(struct udevice *dev) int timer_timebase_fallback(struct udevice *dev)
{ {
struct udevice *cpu; struct udevice *cpu;