From: Simon Glass <sjg@chromium.org>
Date: Mon, 28 Feb 2022 19:08:28 +0000 (-0700)
Subject: spi: Avoid checking console in SPL
X-Git-Tag: baikal/mips/sdk5.9~3^2~118^2~7
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=09544411ab6c85193ee8345c0d81beaf179aad61;p=uboot.git

spi: Avoid checking console in SPL

When SPI flash is used in SPL there is no console, so ctrlc() cannot be
called. Add a condition to fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index a70fbda4bb..3b7c817c02 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -929,7 +929,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
 
 	while (len) {
 		WATCHDOG_RESET();
-		if (ctrlc()) {
+		if (!IS_ENABLED(CONFIG_SPL_BUILD) && ctrlc()) {
 			addr_known = false;
 			ret = -EINTR;
 			goto erase_err;