diff options
author | imp <imp@FreeBSD.org> | 2016-01-26 06:26:44 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2016-01-26 06:26:44 +0000 |
commit | 873f9f00d3c7b044d6e953d9045c95e05fcf9072 (patch) | |
tree | 41aa698c3198d3b6fc4c3092d0552606111f9368 /sys/boot/mips | |
parent | ce3a8161386089b392109f647671521c966c5cea (diff) | |
download | FreeBSD-src-873f9f00d3c7b044d6e953d9045c95e05fcf9072.zip FreeBSD-src-873f9f00d3c7b044d6e953d9045c95e05fcf9072.tar.gz |
RBX_ defines are in rbx.h, move it there.
Differential Revision: https://reviews.freebsd.org/D5038
Diffstat (limited to 'sys/boot/mips')
-rw-r--r-- | sys/boot/mips/beri/boot2/boot2.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/sys/boot/mips/beri/boot2/boot2.c b/sys/boot/mips/beri/boot2/boot2.c index 9a0dda1..9728a20 100644 --- a/sys/boot/mips/beri/boot2/boot2.c +++ b/sys/boot/mips/beri/boot2/boot2.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include <sdcard.h> #include "paths.h" +#include "rbx.h" static int beri_argc; static const char **beri_argv, **beri_envv; @@ -75,41 +76,6 @@ static uint64_t beri_memsize; #define SECOND 1 /* Circa that many ticks in a second. */ -#define RBX_ASKNAME 0x0 /* -a */ -#define RBX_SINGLE 0x1 /* -s */ -/* 0x2 is reserved for log2(RB_NOSYNC). */ -/* 0x3 is reserved for log2(RB_HALT). */ -/* 0x4 is reserved for log2(RB_INITNAME). */ -#define RBX_DFLTROOT 0x5 /* -r */ -#define RBX_KDB 0x6 /* -d */ -/* 0x7 is reserved for log2(RB_RDONLY). */ -/* 0x8 is reserved for log2(RB_DUMP). */ -/* 0x9 is reserved for log2(RB_MINIROOT). */ -#define RBX_CONFIG 0xa /* -c */ -#define RBX_VERBOSE 0xb /* -v */ -#define RBX_SERIAL 0xc /* -h */ -#define RBX_CDROM 0xd /* -C */ -/* 0xe is reserved for log2(RB_POWEROFF). */ -#define RBX_GDB 0xf /* -g */ -#define RBX_MUTE 0x10 /* -m */ -/* 0x11 is reserved for log2(RB_SELFTEST). */ -/* 0x12 is reserved for boot programs. */ -/* 0x13 is reserved for boot programs. */ -#define RBX_PAUSE 0x14 /* -p */ -#define RBX_QUIET 0x15 /* -q */ -#define RBX_NOINTR 0x1c /* -n */ -/* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */ -#define RBX_DUAL 0x1d /* -D */ -/* 0x1f is reserved for log2(RB_BOOTINFO). */ - -/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK (OPT_SET(RBX_ASKNAME) | OPT_SET(RBX_SINGLE) | \ - OPT_SET(RBX_DFLTROOT) | OPT_SET(RBX_KDB ) | \ - OPT_SET(RBX_CONFIG) | OPT_SET(RBX_VERBOSE) | \ - OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \ - OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ - OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) - #define ARGS 0x900 #define NOPT 14 #define MEM_BASE 0x12 @@ -128,9 +94,6 @@ static uint64_t beri_memsize; /* Hard-coded assumption about location of JTAG-loaded kernel. */ #define DRAM_KERNEL_ADDR ((void *)mips_phys_to_cached(0x20000)) -#define OPT_SET(opt) (1 << (opt)) -#define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) - extern uint32_t _end; static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ |