summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRobin van der Gracht <robin@protonic.nl>2022-06-16 15:11:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-06-17 09:09:08 +0200
commit18e37446ea3c99d803b7d02640ff5252f60a44f5 (patch)
tree8ea912a8c088cb3d2f0bab3884f5d41c95249929 /arch
parent48cb9e4a511de1a4d26c5fd503946cc1b9a45912 (diff)
downloadbarebox-18e37446ea3c99d803b7d02640ff5252f60a44f5.tar.gz
barebox-18e37446ea3c99d803b7d02640ff5252f60a44f5.tar.xz
ARM: boards: protonic-imx6: Remove usb_delay from the priv struct
It's only used in one function right now. Signed-off-by: Robin van der Gracht <robin@protonic.nl> Link: https://lore.barebox.org/20220616131114.214628-8-robin@protonic.nl Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/protonic-imx6/board.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index 5323180eeb..dae4a6f817 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -88,7 +88,6 @@ struct prt_imx6_priv {
unsigned int hw_id;
unsigned int hw_rev;
const char *name;
- unsigned int usb_delay;
unsigned int no_usb_check;
};
@@ -423,6 +422,7 @@ static int prt_imx6_env_init(struct prt_imx6_priv *priv)
const struct prt_machine_data *dcfg = priv->dcfg;
struct device_d *dev = priv->dev;
char *delay, *bootsrc, *boot_targets;
+ unsigned int autoboot_timeout;
int ret;
ret = setenv("global.linux.bootargs.base", "consoleblank=0 vt.color=0x00");
@@ -433,12 +433,12 @@ static int prt_imx6_env_init(struct prt_imx6_priv *priv)
set_autoboot_state(AUTOBOOT_BOOT);
} else {
if (dcfg->flags & PRT_IMX6_USB_LONG_DELAY)
- priv->usb_delay = 4;
+ autoboot_timeout = 4;
else
- priv->usb_delay = 1;
+ autoboot_timeout = 1;
/* the usb_delay value is used for poller_call_async() */
- delay = basprintf("%d", priv->usb_delay);
+ delay = basprintf("%d", autoboot_timeout);
ret = setenv("global.autoboot_timeout", delay);
free(delay);
if (ret)