Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: tegra: Guard memory controller code with a Kconfig symbol

Browse source 
Memory controller code is not relevant on all Tegra SoC generations, so
guard it with a Kconfig symbol that can be selected by the generations
that need it.

This is in preparation for unifying Tegra186 code with the code used on
older generations.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding 2019-04-15 11:32:20 +02:00 committed by Tom Warren
parent 9e57819294
commit 1a869c703d
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-tegra/Kconfig
View file

@ -26,6 +26,9 @@ config TEGRA_IVC
U-Boot, it is typically used for communication between the main CPU U-Boot, it is typically used for communication between the main CPU
and various auxiliary processors. and various auxiliary processors.
config TEGRA_MC
bool
config TEGRA_COMMON config TEGRA_COMMON
bool "Tegra common options" bool "Tegra common options"
select BINMAN select BINMAN
@ -65,6 +68,7 @@ config TEGRA_ARMV7_COMMON
select TEGRA_COMMON select TEGRA_COMMON
select TEGRA_GPIO select TEGRA_GPIO
select TEGRA_GP_PADCTRL select TEGRA_GP_PADCTRL
select TEGRA_MC
select TEGRA_NO_BPMP select TEGRA_NO_BPMP
config TEGRA_ARMV8_COMMON config TEGRA_ARMV8_COMMON
@ -111,6 +115,7 @@ config TEGRA210
select TEGRA_CLKRST select TEGRA_CLKRST
select TEGRA_GPIO select TEGRA_GPIO
select TEGRA_GP_PADCTRL select TEGRA_GP_PADCTRL
select TEGRA_MC
select TEGRA_NO_BPMP select TEGRA_NO_BPMP
config TEGRA186 config TEGRA186

7
arch/arm/mach-tegra/board.c
View file

@ -13,7 +13,9 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#endif #endif
#include <asm/arch/funcmux.h> #include <asm/arch/funcmux.h>
#if IS_ENABLED(CONFIG_TEGRA_MC)
#include <asm/arch/mc.h> #include <asm/arch/mc.h>
#endif
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
#include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/board.h> #include <asm/arch-tegra/board.h>
@ -68,6 +70,7 @@ bool tegra_cpu_is_non_secure(void)
} }
#endif #endif
#if IS_ENABLED(CONFIG_TEGRA_MC)
/* Read the RAM size directly from the memory controller */ /* Read the RAM size directly from the memory controller */
static phys_size_t query_sdram_size(void) static phys_size_t query_sdram_size(void)
{ {
@ -117,11 +120,15 @@ static phys_size_t query_sdram_size(void)
return size_bytes; return size_bytes;
} }
#endif
int dram_init(void) int dram_init(void)
{ {
#if IS_ENABLED(CONFIG_TEGRA_MC)
/* We do not initialise DRAM here. We just query the size */ /* We do not initialise DRAM here. We just query the size */
gd->ram_size = query_sdram_size(); gd->ram_size = query_sdram_size();
#endif
return 0; return 0;
} }