Deleted Added
full compact
boot2.c (183671) boot2.c (186352)
1/*-
2 * Copyright (c) 2008 John Hay
3 * Copyright (c) 1998 Robert Nordier
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms are freely
7 * permitted provided that the above copyright notice and this
8 * paragraph and the following disclaimer are duplicated in all
9 * such forms.
10 *
11 * This software is provided "AS IS" and without any express or
12 * implied warranties, including, without limitation, the implied
13 * warranties of merchantability and fitness for a particular
14 * purpose.
15 */
16
17#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 John Hay
3 * Copyright (c) 1998 Robert Nordier
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms are freely
7 * permitted provided that the above copyright notice and this
8 * paragraph and the following disclaimer are duplicated in all
9 * such forms.
10 *
11 * This software is provided "AS IS" and without any express or
12 * implied warranties, including, without limitation, the implied
13 * warranties of merchantability and fitness for a particular
14 * purpose.
15 */
16
17#include <sys/cdefs.h>
18__FBSDID("$FreeBSD: head/sys/boot/arm/ixp425/boot2/boot2.c 183671 2008-10-07 17:27:37Z imp $");
18__FBSDID("$FreeBSD: head/sys/boot/arm/ixp425/boot2/boot2.c 186352 2008-12-20 03:26:09Z sam $");
19
20#include <sys/param.h>
21#include <sys/disklabel.h>
22#include <sys/diskmbr.h>
23#include <sys/dirent.h>
24#include <sys/reboot.h>
25
26#include <machine/elf.h>

--- 131 unchanged lines hidden (view full) ---

158 const char *bt;
159 int autoboot, c = 0;
160 ino_t ino;
161
162 dmadat = (void *)(0x1c0000);
163 p_memset((char *)dmadat, 0, 32 * 1024);
164 bt = board_init();
165
19
20#include <sys/param.h>
21#include <sys/disklabel.h>
22#include <sys/diskmbr.h>
23#include <sys/dirent.h>
24#include <sys/reboot.h>
25
26#include <machine/elf.h>

--- 131 unchanged lines hidden (view full) ---

158 const char *bt;
159 int autoboot, c = 0;
160 ino_t ino;
161
162 dmadat = (void *)(0x1c0000);
163 p_memset((char *)dmadat, 0, 32 * 1024);
164 bt = board_init();
165
166 printf("FreeBSD ARM (%s) boot2 v%d.%d\n", bt, 0, 3);
166 printf("FreeBSD ARM (%s) boot2 v%d.%d\n", bt, 0, 4);
167
168 autoboot = 1;
169
170 /* Process configuration file */
171 if ((ino = lookup(PATH_CONFIG)))
172 fsread(ino, cmd, sizeof(cmd));
173
174 if (*cmd) {

--- 309 unchanged lines hidden ---
167
168 autoboot = 1;
169
170 /* Process configuration file */
171 if ((ino = lookup(PATH_CONFIG)))
172 fsread(ino, cmd, sizeof(cmd));
173
174 if (*cmd) {

--- 309 unchanged lines hidden ---