diff options
| author | Tom Rini <[email protected]> | 2022-09-13 08:19:42 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-09-13 08:19:42 -0400 |
| commit | d6a03711fde2a6c99614af20ee95a9efe7ad232b (patch) | |
| tree | 76f6bbb101ade2f91c63fd70d9a87e5a60945308 /tools | |
| parent | 0ba282e0eeaf29fd78f021fd2f95f7bc3109868d (diff) | |
| parent | 5818198e6a184963c6afc82178b23a64435ace6a (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Armada 32bit: Cache setup fixes (Pali)
- cmd: mvebu/bubt: Misc enhancements (Pali)
- kirkwood: Add CONFIG_SUPPORT_PASSING_ATAGS (Tony)
- board: turris: Misc improvements (Pali)
- tools: kwboot: Change KWBOOT_MSG_RSP_TIMEO_AXP to 10ms (Stefan)
- tools: termios_linux.h: Fix compilation on non-glibc systems (Pali)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kwboot.c | 2 | ||||
| -rw-r--r-- | tools/termios_linux.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/kwboot.c b/tools/kwboot.c index 16bcd4d9a77..da4fe32da22 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -84,7 +84,7 @@ static unsigned char kwboot_msg_debug[] = { #define KWBOOT_MSG_RSP_TIMEO 50 /* ms */ /* Defines known to work on Armada XP */ -#define KWBOOT_MSG_RSP_TIMEO_AXP 1000 /* ms */ +#define KWBOOT_MSG_RSP_TIMEO_AXP 10 /* ms */ /* * Xmodem Transfers diff --git a/tools/termios_linux.h b/tools/termios_linux.h index 45f5c1233c0..0806a91180a 100644 --- a/tools/termios_linux.h +++ b/tools/termios_linux.h @@ -29,6 +29,7 @@ #include <errno.h> #include <sys/ioctl.h> #include <sys/types.h> +#include <asm/ioctls.h> #include <asm/termbits.h> #if defined(BOTHER) && defined(TCGETS2) |