One dangling set (but no check) of RB_DFLFTROOT to zap with the #defines
themselves
ok?
Index: sys/reboot.h
===================================================================
RCS file: /cvs/src/sys/sys/reboot.h,v
retrieving revision 1.17
diff -u -p -r1.17 reboot.h
--- sys/reboot.h 11 Jul 2014 14:36:44 -0000 1.17
+++ sys/reboot.h 15 Apr 2017 19:01:06 -0000
@@ -45,16 +45,11 @@
#define RB_SINGLE 0x0002 /* reboot to single user only */
#define RB_NOSYNC 0x0004 /* dont sync before reboot */
#define RB_HALT 0x0008 /* don't reboot, just halt */
-#define RB_INITNAME 0x0010 /* name given for /etc/init (unused) */
-#define RB_DFLTROOT 0x0020 /* use compiled-in rootdev */
#define RB_KDB 0x0040 /* give control to kernel debugger */
-#define RB_RDONLY 0x0080 /* mount root fs read-only */
#define RB_DUMP 0x0100 /* dump kernel memory before reboot */
-#define RB_MINIROOT 0x0200 /* mini-root present in memory at boot
time */
#define RB_CONFIG 0x0400 /* change configured devices */
#define RB_TIMEBAD 0x0800 /* don't call resettodr() in boot() */
#define RB_POWERDOWN 0x1000 /* attempt to power down machine */
-#define RB_SERCONS 0x2000 /* use serial console if available */
#define RB_USERREQ 0x4000 /* boot() called at user request (e.g.
ddb) */
/*
Index: arch/armv7/armv7/armv7_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/armv7/armv7/armv7_machdep.c,v
retrieving revision 1.47
diff -u -p -r1.47 armv7_machdep.c
--- arch/armv7/armv7/armv7_machdep.c 24 Mar 2017 13:04:16 -0000 1.47
+++ arch/armv7/armv7/armv7_machdep.c 15 Apr 2017 19:01:06 -0000
@@ -473,10 +473,6 @@ initarm(void *arg0, void *arg1, void *ar
printf("arg0 %p arg1 %p arg2 %p\n", arg0, arg1, arg2);
-#ifdef RAMDISK_HOOKS
- boothowto |= RB_DFLTROOT;
-#endif /* RAMDISK_HOOKS */
-
physical_freestart = (((unsigned long)esym - KERNEL_TEXT_BASE + 0xfff)
& ~0xfff) + loadaddr;
physical_freeend = MIN((uint64_t)physical_end, (paddr_t)-PAGE_SIZE);
