summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2015-07-17 08:12:51 -0700
committerTom Warren <twarren@nvidia.com>2015-07-28 10:30:19 -0700
commit56079eccd18a65bd5eea2f6a665862932c61963c (patch)
treef3a26f666597d7dcf76070b1a1810857625a76be
parent659a07555dcb50be5464513cb109dd1755f052ec (diff)
downloadu-boot-imx-56079eccd18a65bd5eea2f6a665862932c61963c.zip
u-boot-imx-56079eccd18a65bd5eea2f6a665862932c61963c.tar.gz
u-boot-imx-56079eccd18a65bd5eea2f6a665862932c61963c.tar.bz2
Tegra: Rework KConfig options to allow 64-bit builds (T210)
Moved Tegra config options to mach-tegra/Kconfig so that both 32-bit and 64-bit builds can co-exist for Tegra SoCs. T210 will be 64-bit only (no SPL) and will require a 32-bit AVP/BPMP loader. Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/Kconfig11
-rw-r--r--arch/arm/mach-tegra/Kconfig18
2 files changed, 18 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3355b3b..65e710a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -687,17 +687,6 @@ config TARGET_XILINX_ZYNQMP
config TEGRA
bool "NVIDIA Tegra"
- select SUPPORT_SPL
- select SPL
- select OF_CONTROL
- select SPL_DISABLE_OF_CONTROL
- select CPU_V7
- select DM
- select DM_SPI_FLASH
- select DM_SERIAL
- select DM_I2C
- select DM_SPI
- select DM_GPIO
config TARGET_VEXPRESS64_AEMV8A
bool "Support vexpress_aemv8a"
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 54bd648..7533e57 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,20 +1,38 @@
if TEGRA
+config TEGRA_ARMV7_COMMON
+ bool "Tegra 32-bit"
+ select SUPPORT_SPL
+ select SPL
+ select OF_CONTROL
+ select SPL_DISABLE_OF_CONTROL
+ select CPU_V7
+ select DM
+ select DM_SPI_FLASH
+ select DM_SERIAL
+ select DM_I2C
+ select DM_SPI
+ select DM_GPIO
+
choice
prompt "Tegra SoC select"
optional
config TEGRA20
bool "Tegra20 family"
+ select TEGRA_ARMV7_COMMON
config TEGRA30
bool "Tegra30 family"
+ select TEGRA_ARMV7_COMMON
config TEGRA114
bool "Tegra114 family"
+ select TEGRA_ARMV7_COMMON
config TEGRA124
bool "Tegra124 family"
+ select TEGRA_ARMV7_COMMON
endchoice