From owner-svn-src-head@FreeBSD.ORG  Fri May 11 14:45:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CC601065674;
	Fri, 11 May 2012 14:45:30 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 27CDC8FC17;
	Fri, 11 May 2012 14:45:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4BEjUir087742;
	Fri, 11 May 2012 14:45:30 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4BEjT6p087740;
	Fri, 11 May 2012 14:45:29 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201205111445.q4BEjT6p087740@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 May 2012 14:45:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235272 - head/sys/boot/arm/at91/boot2
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2012 14:45:30 -0000

Author: imp
Date: Fri May 11 14:45:29 2012
New Revision: 235272
URL: http://svn.freebsd.org/changeset/base/235272

Log:
  Add support for passing in the board ID.
  
  # This doesn't implement the full Linux boot ABI for arm yet.
  # since there's no ATAGs list passed in for r2, and r0 has
  # boot options rather than 0 as specified in the standard.
  # Commited code to the tree won't touch any of this anyway, but
  # future code may be able to use this.

Modified:
  head/sys/boot/arm/at91/boot2/boot2.c

Modified: head/sys/boot/arm/at91/boot2/boot2.c
==============================================================================
--- head/sys/boot/arm/at91/boot2/boot2.c	Fri May 11 14:40:25 2012	(r235271)
+++ head/sys/boot/arm/at91/boot2/boot2.c	Fri May 11 14:45:29 2012	(r235272)
@@ -86,11 +86,12 @@ static const unsigned char flags[NOPT] =
 	RBX_VERBOSE
 };
 
+unsigned board_id; /* board type to pass to kernel, if set by board_* code */
 unsigned dsk_start;
 static char cmd[512];
 static char kname[1024];
 static uint32_t opts;
-static int dsk_meta;
+static uint8_t dsk_meta;
 
 static void load(void);
 static int parse(void);
@@ -241,7 +242,7 @@ load(void)
 #ifdef FIXUP_BOOT_DRV
 	fixup_boot_drv(staddr, klen, bootslice, bootpart);
 #endif
-	((void(*)(int))addr)(opts & RBX_MASK);
+	((void(*)(int, int, int, int))addr)(opts & RBX_MASK, board_id, 0, 0);
 }
 
 static int