Convert CONFIG_THOR_RESET_OFF to Kconfig

This converts the following to Kconfig:
   CONFIG_THOR_RESET_OFF

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d93731f2af686cc5c7786e82efbd3bab2b41e7c8..47d2ef04a2abcb427af23eefbe6576f82f543f2b 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -526,6 +526,10 @@ config CMD_THOR_DOWNLOAD
          There is no documentation about this within the U-Boot source code
          but you should be able to find something on the interwebs.
 
+config THOR_RESET_OFF
+       bool "thor: Disable reset on completion"
+       depends on CMD_THOR_DOWNLOAD
+
 config CMD_ZBOOT
        bool "zboot - x86 boot command"
        help

diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
index ece625f629243a2cafd047b0f3047feebc46975f..2ae1fb82797b09b3d5b8b6d4d237ba5f6fe60a8e 100644 (file)
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y

diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
index 693a602ea39540315ec0de4c2d44bb9a86073576..510ff2ebd877bc6953430dbda9dcb104affa2b68 100644 (file)
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y

diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index 97624e69e722903987598e45150fffe13bf0db45..0b708cccf6e95810f4f22fc7e7b91c981da3abfc 100644 (file)
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y

diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig
index 506856576904c2b9a9980b64dff0087cc1150948..610d9de2a637d9a63b952ec00121d63fa672ba7a 100644 (file)
--- a/configs/xilinx_zynq_virt_defconfig
+++ b/configs/xilinx_zynq_virt_defconfig
@@ -51,6 +51,7 @@ CONFIG_SYS_PBSIZE=2071
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y

diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 4732c39bdbe14e55a62261e94e074a07e785e741..ab2a5426518e4b5f291aca8c604a370cf7008a23 100644 (file)
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -55,6 +55,7 @@ CONFIG_SYS_PBSIZE=2073
 CONFIG_SYS_BOOTM_LEN=0x6400000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_MEMTEST=y

diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index ee3130ed327737c46f473cb197bb9cab7cd9b9d6..6ee6786e054a9a3e881e0479224af046d66343f8 100644 (file)
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -25,7 +25,6 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define CONFIG_THOR_RESET_OFF
 #endif
 
 /* Ethernet driver */

diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 7d77189693e2cf946390b4c41c5db201e04bf5f5..37bdb214629d6068ebc4b9b767b36ebc851f845c 100644 (file)
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -25,7 +25,6 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define CONFIG_THOR_RESET_OFF
 #define DFU_ALT_INFO_RAM \
        "dfu_ram_info=" \
        "setenv dfu_alt_info " \

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index efe241df97eb2166f0f9ef467a965e9fc9ed4f57..f71cd6609932cabe107121f9c779943eb8f688f8 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -31,7 +31,6 @@
 
 #if defined(CONFIG_ZYNQMP_USB)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define CONFIG_THOR_RESET_OFF
 
 # define PARTS_DEFAULT \
        "partitions=uuid_disk=${uuid_gpt_disk};" \

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 37b54289073bb9ed6ec1cbcbc140b7b3cbe08a39..d95178eb64221b8e84b8e073fe7d744b8b05eb6e 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
 # define DFU_DEFAULT_POLL_TIMEOUT      300
-# define CONFIG_THOR_RESET_OFF
 #endif
 
 /* enable preboot to be loaded before CONFIG_BOOTDELAY */