From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 16 Dec 2020 07:24:37 +0000 (+0100)
Subject: Revert "tizen: vim3(l)_deconfig: enable THOR mode if Func button is pressed"
X-Git-Tag: submit/tizen/20201222.005612~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9da656d0960e8f0b30956eb68ed1b4f62a93348e;p=platform%2Fkernel%2Fu-boot.git

Revert "tizen: vim3(l)_deconfig: enable THOR mode if Func button is pressed"

This reverts commit 0548fab316eac104e8cdd77cb505407facfbc115.

This commit will be changed to use the solution applied in mainline
uboot.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I8a01980a0f134ac427aeee8af921bce540fbebd3
---

diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig
index b39f23cdb0..767990b7d0 100644
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3"
 CONFIG_DEBUG_UART=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="run mbr_check; echo Checking Func button state (for THOR download mode): \\\\\\\\c; sleep 0.25; button Function; if test ${button} = on; then thor; fi"
+CONFIG_PREBOOT="run mbr_check"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
@@ -23,7 +23,6 @@ CONFIG_SYS_PROMPT="Khadas VIM3> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_ADC=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_LOADS is not set
@@ -42,9 +41,6 @@ CONFIG_ENV_FAT_FILE="params-vim3.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SARADC_MESON=y
-CONFIG_BUTTON=y
-CONFIG_BUTTON_ADC=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y
diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig
index ebcb9f203b..a68fc86769 100644
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -15,14 +15,13 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l"
 CONFIG_DEBUG_UART=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="run mbr_check; echo Checking Func button state (for THOR download mode): \\\\\\\\c; sleep 0.25; button Function; if test ${button} = on; then thor; fi"
+CONFIG_PREBOOT="run mbr_check"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="Khadas VIM3L> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_THOR_DOWNLOAD=y
-CONFIG_CMD_ADC=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_LOADS is not set
@@ -41,9 +40,6 @@ CONFIG_ENV_FAT_FILE="params-vim3l.bin"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SARADC_MESON=y
-CONFIG_BUTTON=y
-CONFIG_BUTTON_ADC=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_MESON_GX=y