From: Michal Simek Date: Fri, 16 Dec 2016 12:55:15 +0000 (+0100) Subject: ARM64: zynqmp: Remove BOOTDELAY setup from board file X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce28e84542a7a3ff84fcc5950f1f78c8faee3d68;p=thirdparty%2Fu-boot.git ARM64: zynqmp: Remove BOOTDELAY setup from board file Simplify configuration. Signed-off-by: Michal Simek --- diff --git a/configs/xilinx_zynqmp_mini_emmc_defconfig b/configs/xilinx_zynqmp_mini_emmc_defconfig index 868e5003244..46e7dcd531c 100644 --- 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 ffcf83807d5..cb9e2bcb25f 100644 --- 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 b664ac989ce..0307a7269c8 100644 --- 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 3bd83803949..a56b5d89743 100644 --- 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