ARM64: zynqmp: Remove BOOTDELAY setup from board file

Simplify configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/xilinx_zynqmp_mini_emmc_defconfig b/configs/xilinx_zynqmp_mini_emmc_defconfig
index 868e50032440a2d0af3cdc3aa623b413cec4e286..46e7dcd531c2c49e02fb33faf9befda57719b2fd 100644 (file)
--- a/configs/xilinx_zynqmp_mini_emmc_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_EMMC"
+CONFIG_BOOTDELAY=-1
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_BDI is not set

diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
index ffcf83807d522be65bb0ba7c14948beaaf37fed0..cb9e2bcb25fac3d395eeffa785e1f83aed0e6151 100644 (file)
--- a/configs/xilinx_zynqmp_mini_nand_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x10000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_NAND"
+CONFIG_BOOTDELAY=-1
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_BDI is not set

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index b664ac989ceee2fb6ee474c90c59c5bbd4ebcfd7..0307a7269c86effaf2723017ae66f714318e5b07 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -5,6 +5,7 @@ CONFIG_ZYNQMP_QSPI=y
 CONFIG_SYS_TEXT_BASE=0xFFFC0000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi"
 CONFIG_SYS_EXTRA_OPTIONS="MINI_QSPI"
+CONFIG_BOOTDELAY=-1
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="ZynqMP> "
 # CONFIG_CMD_BDI is not set

diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 3bd83803949731c9206e4d8d8de5dad49cf89208..a56b5d897432ebec0cfd803d72e4d630d5d851a4 100644 (file)
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -28,7 +28,6 @@
 #undef CONFIG_BOOTCOMMAND
 #undef CONFIG_SYS_HUSH_PARSER
 #undef CONFIG_SYS_PROMPT_HUSH_PS2
-#undef CONFIG_BOOTDELAY
 #undef CONFIG_PREBOOT
 #undef CONFIG_SYS_MALLOC_LEN
 #undef CONFIG_ENV_SIZE
@@ -74,7 +73,6 @@
 
 /* Define needed configs */
 #define CONFIG_CMD_MEMORY
-#define CONFIG_BOOTDELAY       -1 /* -1 to Disable autoboot */
 
 #undef CONFIG_NR_DRAM_BANKS
 #define CONFIG_NR_DRAM_BANKS   1