Deleted Added
full compact
main.c (266885) main.c (266893)
1/*-
2 * Copyright (c) 2013-2014 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * This software was developed by SRI International and the University of
6 * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
7 * ("CTSRD"), as part of the DARPA CRASH research programme.
8 *

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

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2013-2014 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * This software was developed by SRI International and the University of
6 * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
7 * ("CTSRD"), as part of the DARPA CRASH research programme.
8 *

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

24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/boot/mips/beri/loader/main.c 266885 2014-05-30 13:53:37Z hselasky $");
32__FBSDID("$FreeBSD: head/sys/boot/mips/beri/loader/main.c 266893 2014-05-30 16:47:54Z hselasky $");
33
34#include <sys/param.h>
35#include <sys/linker.h>
36#include <sys/reboot.h>
37
38#include <machine/bootinfo.h>
39#include <machine/elf.h>
40
41#include <stand.h>
42#include <bootstrap.h>
43#include <loader.h>
44#include <mips.h>
45
33
34#include <sys/param.h>
35#include <sys/linker.h>
36#include <sys/reboot.h>
37
38#include <machine/bootinfo.h>
39#include <machine/elf.h>
40
41#include <stand.h>
42#include <bootstrap.h>
43#include <loader.h>
44#include <mips.h>
45
46#ifdef LOADER_USB_SUPPORT
47#include <storage/umass_common.h>
48#endif
49
46static int __elfN(exec)(struct preloaded_file *);
47static void extract_currdev(struct bootinfo *);
48
49struct devsw *devsw[] = {
50 &beri_cfi_disk,
51 &beri_sdcard_disk,
50static int __elfN(exec)(struct preloaded_file *);
51static void extract_currdev(struct bootinfo *);
52
53struct devsw *devsw[] = {
54 &beri_cfi_disk,
55 &beri_sdcard_disk,
56#ifdef LOADER_USB_SUPPORT
57 &umass_disk,
58#endif
52 NULL
53};
54
55struct arch_switch archsw;
56
57struct file_format *file_formats[] = {
58 &beri_elf,
59 NULL

--- 180 unchanged lines hidden ---
59 NULL
60};
61
62struct arch_switch archsw;
63
64struct file_format *file_formats[] = {
65 &beri_elf,
66 NULL

--- 180 unchanged lines hidden ---