Author: kevans
Date: Mon Feb 12 18:30:20 2018
New Revision: 329176
URL: https://svnweb.freebsd.org/changeset/base/329176

Log:
  MFC r327705,r328447: Fix BERI bootloader build
  
  r327705: Use <stand.h> instead of <inttypes.h> and <stdio.h> in boot code.
  r328447: BERI isn't BTX, so we don't have to provide exit().

Modified:
  stable/11/stand/mips/beri/boot2/boot2.c
  stable/11/stand/mips/beri/common/sdcard.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/mips/beri/boot2/boot2.c
==============================================================================
--- stable/11/stand/mips/beri/boot2/boot2.c     Mon Feb 12 17:44:35 2018        
(r329175)
+++ stable/11/stand/mips/beri/boot2/boot2.c     Mon Feb 12 18:30:20 2018        
(r329176)
@@ -139,7 +139,6 @@ static int comspeed = SIOSPD;
 struct bootinfo bootinfo;
 static uint8_t ioctrl = IO_KEYBOARD;
 
-void exit(int);
 void putchar(int);
 static void boot_fromdram(void);
 static void boot_fromfs(void);
@@ -277,12 +276,6 @@ main(u_int argc, const char *argv[], const char *envv[
        else
            load();
     }
-}
-
-/* XXX - Needed for btxld to link the boot2 binary; do not remove. */
-void
-exit(int x)
-{
 }
 
 static void

Modified: stable/11/stand/mips/beri/common/sdcard.c
==============================================================================
--- stable/11/stand/mips/beri/common/sdcard.c   Mon Feb 12 17:44:35 2018        
(r329175)
+++ stable/11/stand/mips/beri/common/sdcard.c   Mon Feb 12 18:30:20 2018        
(r329176)
@@ -33,8 +33,7 @@
 #include <sys/types.h>
 #include <sys/endian.h>
 
-#include <inttypes.h>
-#include <stdio.h>
+#include <stand.h>
 
 
 /*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to