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

arm: mach-k3: Only build init files for SPL

Browse Source 
The content of these files are only used in SPL builds. The contents are
already ifdef for the same, remove that and only include the whole file
in the build when building for SPL.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Andrew Davis
2022-07-15 10:25:26 -05:00
committed by Tom Rini
parent afc13335a5
commit 46da163b72
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-k3/Makefile
View File

@@ -3,16 +3,19 @@
# Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/
# Lokesh Vutla <lokeshvutla@ti.com>
obj-$(CONFIG_SOC_K3_AM6) += am6_init.o
obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o j721e/ j7200/
obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o j721s2/
obj-$(CONFIG_SOC_K3_AM642) += am642_init.o
obj-$(CONFIG_SOC_K3_AM625) += am625_init.o am62x/
obj-$(CONFIG_SOC_K3_J721E) += j721e/ j7200/
obj-$(CONFIG_SOC_K3_J721S2) += j721s2/
obj-$(CONFIG_SOC_K3_AM625) += am62x/
obj-$(CONFIG_ARM64) += arm64-mmu.o
obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o
obj-$(CONFIG_TI_SECURE_DEVICE) += security.o
obj-$(CONFIG_ARM64) += cache.o
ifeq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_SOC_K3_AM6) += am6_init.o
obj-$(CONFIG_SOC_K3_J721E) += j721e_init.o
obj-$(CONFIG_SOC_K3_J721S2) += j721s2_init.o
obj-$(CONFIG_SOC_K3_AM642) += am642_init.o
obj-$(CONFIG_SOC_K3_AM625) += am625_init.o
obj-$(CONFIG_K3_LOAD_SYSFW) += sysfw-loader.o
endif
obj-y += common.o

4
arch/arm/mach-k3/am625_init.c
View File

@@ -15,8 +15,6 @@
#include <dm/uclass-internal.h>
#include <dm/pinctrl.h>
#if defined(CONFIG_SPL_BUILD)
/*
* This uninitialized global variable would normal end up in the .bss section,
* but the .bss is cleared between writing and reading this variable, so move
@@ -290,5 +288,3 @@ u32 spl_boot_device(void)
return bootmedia;
}
#endif /* CONFIG_SPL_BUILD */

2
arch/arm/mach-k3/am642_init.c
View File

@@ -23,7 +23,6 @@
#include <mmc.h>
#include <dm/root.h>
#if defined(CONFIG_SPL_BUILD)
#define MCU_CTRL_MMR0_BASE 0x04500000
#define CTRLMMR_MCU_RST_CTRL 0x04518170
@@ -348,7 +347,6 @@ u32 spl_boot_device(void)
else
return __get_backup_bootmedia(devstat);
}
#endif
#if defined(CONFIG_SYS_K3_SPL_ATF)

2
arch/arm/mach-k3/am6_init.c
View File

@@ -26,7 +26,6 @@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_SPL_BUILD
#ifdef CONFIG_K3_LOAD_SYSFW
#ifdef CONFIG_TI_SECURE_DEVICE
struct fwl_data main_cbass_fwls[] = {
@@ -359,7 +358,6 @@ u32 spl_boot_device(void)
else
return __get_backup_bootmedia(devstat);
}
#endif
#ifdef CONFIG_SYS_K3_SPL_ATF

2
arch/arm/mach-k3/j721e_init.c
View File

@@ -24,7 +24,6 @@
#include <mmc.h>
#include <remoteproc.h>
#ifdef CONFIG_SPL_BUILD
#ifdef CONFIG_K3_LOAD_SYSFW
#ifdef CONFIG_TI_SECURE_DEVICE
struct fwl_data cbass_hc_cfg0_fwls[] = {
@@ -384,7 +383,6 @@ u32 spl_boot_device(void)
else
return __get_backup_bootmedia(main_devstat);
}
#endif
#ifdef CONFIG_SYS_K3_SPL_ATF

3
arch/arm/mach-k3/j721s2_init.c
View File

@@ -22,8 +22,6 @@
#include <mmc.h>
#include <remoteproc.h>
#ifdef CONFIG_SPL_BUILD
static void ctrl_mmr_unlock(void)
{
/* Unlock all WKUP_CTRL_MMR0 module registers */
@@ -255,7 +253,6 @@ u32 spl_boot_device(void)
else
return __get_backup_bootmedia(main_devstat);
}
#endif
#define J721S2_DEV_MCU_RTI0 295
#define J721S2_DEV_MCU_RTI1 296