From: Thierry Reding <thierry.reding@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/12] ARM: tegra: Guard GP pad control code with a Kconfig symbol
Date: Fri, 8 Mar 2019 20:43:29 +0100 [thread overview]
Message-ID: <20190308194338.31992-4-thierry.reding@gmail.com> (raw)
In-Reply-To: <20190308194338.31992-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
The GP pad control 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>
---
arch/arm/mach-tegra/Kconfig | 5 +++++
arch/arm/mach-tegra/Makefile | 2 +-
arch/arm/mach-tegra/cache.c | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ee078fec9adc..265051b18aaf 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -15,6 +15,9 @@ config SPL_SERIAL_SUPPORT
config TEGRA_CLKRST
bool
+config TEGRA_GP_PADCTRL
+ bool
+
config TEGRA_IVC
bool "Tegra IVC protocol"
help
@@ -61,6 +64,7 @@ config TEGRA_ARMV7_COMMON
select TEGRA_CLKRST
select TEGRA_COMMON
select TEGRA_GPIO
+ select TEGRA_GP_PADCTRL
select TEGRA_NO_BPMP
config TEGRA_ARMV8_COMMON
@@ -106,6 +110,7 @@ config TEGRA210
select TEGRA_ARMV8_COMMON
select TEGRA_CLKRST
select TEGRA_GPIO
+ select TEGRA_GP_PADCTRL
select TEGRA_NO_BPMP
config TEGRA186
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 0e812818d7a2..69f802c01b45 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -13,7 +13,7 @@ else
obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o
endif
-obj-y += ap.o
+obj-$(CONFIG_TEGRA_GP_PADCTRL) += ap.o
obj-y += board.o board2.o
obj-y += cache.o
obj-$(CONFIG_TEGRA_CLKRST) += clock.o
diff --git a/arch/arm/mach-tegra/cache.c b/arch/arm/mach-tegra/cache.c
index be414e4e4aca..d7063490e222 100644
--- a/arch/arm/mach-tegra/cache.c
+++ b/arch/arm/mach-tegra/cache.c
@@ -8,7 +8,9 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch-tegra/ap.h>
+#if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL)
#include <asm/arch/gp_padctrl.h>
+#endif
#ifndef CONFIG_ARM64
void config_cache(void)
--
2.20.1
next prev parent reply other threads:[~2019-03-08 19:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 19:43 [U-Boot] [PATCH 00/12] ARM: tegra: Share cboot code with Tegra210 Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 01/12] ARM: tegra: Use common header for PMU declarations Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 02/12] ARM: tegra: Guard clock code with a Kconfig symbol Thierry Reding
2019-03-08 19:43 ` Thierry Reding [this message]
2019-03-08 19:43 ` [U-Boot] [PATCH 04/12] ARM: tegra: Guard memory controller " Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 05/12] ARM: tegra: Guard pin " Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 06/12] ARM: tegra: Guard powergate " Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 07/12] ARM: tegra: Fix save_boot_params() prototype Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 08/12] ARM: tegra: Unify Tegra186 builds Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 09/12] ARM: tegra: Allow boards to override boot target devices Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 10/12] ARM: tegra: Implement cboot_save_boot_params() in C Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 11/12] ARM: tegra: Support TZ-only access to PMC Thierry Reding
2019-03-08 19:43 ` [U-Boot] [PATCH 12/12] ARM: tegra: Implement cboot_get_ethaddr() Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190308194338.31992-4-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox