From owner-svn-src-stable@freebsd.org Mon Feb 12 18:30:21 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49DE0F0FABB; Mon, 12 Feb 2018 18:30:21 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB4BC8398F; Mon, 12 Feb 2018 18:30:20 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1DB4158C9; Mon, 12 Feb 2018 18:30:20 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1CIUKg1094240; Mon, 12 Feb 2018 18:30:20 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1CIUKFu094238; Mon, 12 Feb 2018 18:30:20 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802121830.w1CIUKFu094238@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 12 Feb 2018 18:30:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r329176 - in stable/11/stand/mips/beri: boot2 common X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/stand/mips/beri: boot2 common X-SVN-Commit-Revision: 329176 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2018 18:30:21 -0000 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 instead of and 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 #include -#include -#include +#include /*