colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: compile clock.c for SPL only

Browse Source 
With the clock_twi_onoff() function now being called only from the SPL,
the whole clock.c file in arch/arm/mach-sunxi is needed by SPL code
only.

Remove the redundant #ifdef from the clock_init() function, actually
this function was already only called from the SPL.
Then adjust the Makefile to compile clock.c only with CONFIG_SPL_BUILD
defined.

This avoids unnecessary code in U-Boot proper and allows further
refactoring and code-split between the SPL and U-Boot proper.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara
2023-12-07 16:06:04 +00:00
parent 1a6828d0c5
commit 8cb3c49454
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-sunxi/Makefile
View File

@@ -7,7 +7,6 @@
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
obj-y += board.o obj-y += board.o
obj-y += clock.o
obj-y += cpu_info.o obj-y += cpu_info.o
obj-y += dram_helpers.o obj-y += dram_helpers.o
obj-$(CONFIG_SUN6I_PRCM) += prcm.o obj-$(CONFIG_SUN6I_PRCM) += prcm.o
@@ -31,6 +30,7 @@ obj-y += timer.o
endif endif
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-y += clock.o
obj-$(CONFIG_MACH_SUNIV) += dram_suniv.o obj-$(CONFIG_MACH_SUNIV) += dram_suniv.o
obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o
obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o

2
arch/arm/mach-sunxi/clock.c
View File

@@ -23,10 +23,8 @@ __weak void gtbus_init(void)
int clock_init(void) int clock_init(void)
{ {
#ifdef CONFIG_SPL_BUILD
clock_init_safe(); clock_init_safe();
gtbus_init(); gtbus_init();
#endif
clock_init_uart(); clock_init_uart();
clock_init_sec(); clock_init_sec();