Date: Fri, 11 May 2012 14:45:29 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235272 - head/sys/boot/arm/at91/boot2 Message-ID: <201205111445.q4BEjT6p087740@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205111445.q4BEjT6p087740>