From: Robin van der Gracht <robin@protonic.nl>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org, Robin van der Gracht <robin@protonic.nl>
Subject: [PATCH 2/2] ARM: boards: protonic-imx6: prtvt7: Use autoboot timeout for serial boot
Date: Thu, 27 Mar 2025 11:06:35 +0100 [thread overview]
Message-ID: <20250327100635.656657-2-robin@protonic.nl> (raw)
In-Reply-To: <20250327100635.656657-1-robin@protonic.nl>
Enabling the autoboot timeout for serial boot makes CI easier.
Signed-off-by: Robin van der Gracht <robin@protonic.nl>
---
arch/arm/boards/protonic-imx6/board.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index 4585ca4730..2757ea12b2 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -6,6 +6,7 @@
#include <bbu.h>
#include <boot.h>
#include <bootm.h>
+#include <bootsource.h>
#include <common.h>
#include <deep-probe.h>
#include <environment.h>
@@ -768,9 +769,13 @@ static int prt_imx6_init_prtvt7(struct prt_imx6_priv *priv)
}
gpio_request_one(gpio_f6, GPIOF_DIR_IN | GPIOF_ACTIVE_LOW, "F6");
- if (!(gpio_is_active(gpio_cycle) && gpio_is_active(gpio_f6)))
- priv->no_usb_check = 1;
+ if (gpio_is_active(gpio_cycle) && gpio_is_active(gpio_f6))
+ return 0;
+
+ if (bootsource_get() == BOOTSOURCE_SERIAL)
+ return 0;
+ priv->no_usb_check = 1;
return 0;
}
--
2.43.0
next prev parent reply other threads:[~2025-03-27 10:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-27 10:06 [PATCH 1/2] ARM: boards: protonic-imx6: prtvt7: Don't use fixed numbers for dynamic GPIOs Robin van der Gracht
2025-03-27 10:06 ` Robin van der Gracht [this message]
2025-03-31 8:10 ` Sascha Hauer
2025-03-31 10:25 ` Robin van der Gracht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250327100635.656657-2-robin@protonic.nl \
--to=robin@protonic.nl \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox