From 855110cdd70f66470ff80e9b4abb52a53e69ec18 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 16 Dec 2016 13:58:56 +0100 Subject: [PATCH] ARM64: zynqmp: Simplify BOOTI disabling for mini configuration Disable BOOTI via defconfig. Signed-off-by: Michal Simek --- configs/xilinx_zynqmp_mini_emmc_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + include/configs/xilinx_zynqmp_mini.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/xilinx_zynqmp_mini_emmc_defconfig b/configs/xilinx_zynqmp_mini_emmc_defconfig index 46e7dcd531c..c78844f7828 100644 --- a/configs/xilinx_zynqmp_mini_emmc_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_BOOTI is not set # CONFIG_CMD_GO is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_IMI is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index cb9e2bcb25f..04a48298e0c 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_BOOTI is not set # CONFIG_CMD_GO is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_IMI is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 0307a7269c8..0483f55b1ad 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_BOOTI is not set # CONFIG_CMD_ELF is not set # CONFIG_CMD_GO is not set # CONFIG_CMD_RUN is not set diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 1dec6bb36ab..90691d31009 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -63,7 +63,6 @@ #undef CONFIG_BOOTP_HOSTNAME #undef CONFIG_BOOTP_MAY_FAIL #undef CONFIG_BOOTP_PXE -#undef CONFIG_CMD_BOOTI #undef CONFIG_CMD_UNZIP /* PXE */ -- 2.47.3