1a2,3
> * Copyright (c) 2008 John Hay
> * Copyright (c) 2006 Warner Losh
17c19
< __FBSDID("$FreeBSD: head/sys/boot/arm/at91/boot2/boot2.c 183635 2008-10-05 23:39:28Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/boot/arm/at91/boot2/boot2.c 183636 2008-10-05 23:59:52Z imp $");
54c56
< /* #define RBX_NOINTR 0x1c -n */
---
> #define RBX_NOINTR 0x1c /* -n */
69c71
< #define NOPT 5
---
> extern uint32_t _end;
70a73,74
> #define NOPT 6
>
74,76c78
< extern uint32_t _end;
<
< static const char optstr[NOPT] = "agrsv";
---
> static const char optstr[NOPT] = "agnrsv";
78,82c80,85
< RBX_ASKNAME,
< RBX_GDB,
< RBX_DFLTROOT,
< RBX_SINGLE,
< RBX_VERBOSE
---
> RBX_ASKNAME,
> RBX_GDB,
> RBX_NOINTR,
> RBX_DFLTROOT,
> RBX_SINGLE,
> RBX_VERBOSE
98a102,107
> #ifdef DEBUG
> #define DPRINTF(fmt, ...) printf(fmt, __VA_ARGS__)
> #else
> #define DPRINTF(fmt, ...)
> #endif
>
144a154
> dmadat = (void *)(0x20000000 + (16 << 20));
147,149d156
< dmadat = (void *)(0x20000000 + (16 << 20));
< /* Process configuration file */
<
151a159
> /* Process configuration file */
158c166
< printf("%s: %s", PATH_CONFIG, cmd);
---
> printf("%s: %s\n", PATH_CONFIG, cmd);
163,164d170
< /* Present the user with the boot2 prompt. */
<
166a173,174
>
> /* Present the user with the boot2 prompt. */
169c177,178
< if (!autoboot || (c = getc(2)) != -1)
---
> if (!autoboot ||
> (OPT_CHECK(RBX_NOINTR) == 0 && (c = getc(2)) != 0))