diff mbox

[U-Boot,v3,15/48] Convert CONFIG_CMD_ENTERRCM to Kconfig

Message ID 20170517092544.19357-16-sjg@chromium.org
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass May 17, 2017, 9:25 a.m. UTC
This converts the following to Kconfig:
   CONFIG_CMD_ENTERRCM

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v3: None
Changes in v2: None

 arch/arm/mach-tegra/Kconfig    | 16 ++++++++++++++++
 include/configs/tegra-common.h |  2 --
 scripts/config_whitelist.txt   |  1 -
 3 files changed, 16 insertions(+), 3 deletions(-)

Comments

Tom Rini May 22, 2017, 6 p.m. UTC | #1
On Wed, May 17, 2017 at 03:25:11AM -0600, Simon Glass wrote:

> This converts the following to Kconfig:
>    CONFIG_CMD_ENTERRCM
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index c67ffa5a23..e029607ce6 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -126,4 +126,20 @@  source "arch/arm/mach-tegra/tegra124/Kconfig"
 source "arch/arm/mach-tegra/tegra210/Kconfig"
 source "arch/arm/mach-tegra/tegra186/Kconfig"
 
+config CMD_ENTERRCM
+	bool "Enable 'enterrcm' command"
+	default y
+	help
+	  Tegra's boot ROM supports a mode whereby code may be downloaded and
+	  flash-programmed over a USB connection. On dev boards, this is
+	  typically entered by holding down a "force recovery" button and
+	  resetting the CPU. However, not all boards have such a button (one
+	  example is the Compulab Trimslice), so a method to enter RCM from
+	  software is useful.
+
+	  Even on boards other than Trimslice, controlling this over a UART
+	  may be useful, e.g. to allow simple remote control without the need
+	  for mechanical button actuators, or hooking up relays/... to the
+	  button.
+
 endif
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 5107a1f609..06ea218f8d 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -87,8 +87,6 @@ 
 						CONFIG_SYS_INIT_RAM_SIZE - \
 						GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_CMD_ENTERRCM
-
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 73e2a3fd31..c59c5ce42a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@  CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ENTERRCM
 CONFIG_CMD_ENV
 CONFIG_CMD_ENV_CALLBACK
 CONFIG_CMD_ENV_FLAGS