| boot2.c (235988) | boot2.c (269111) |
|---|---|
| 1/*- 2 * Copyright (c) 2008 John Hay 3 * Copyright (c) 2006 Warner Losh 4 * Copyright (c) 1998 Robert Nordier 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms are freely 8 * permitted provided that the above copyright notice and this 9 * paragraph and the following disclaimer are duplicated in all 10 * such forms. 11 * 12 * This software is provided "AS IS" and without any express or 13 * implied warranties, including, without limitation, the implied 14 * warranties of merchantability and fitness for a particular 15 * purpose. 16 */ 17 18#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2008 John Hay 3 * Copyright (c) 2006 Warner Losh 4 * Copyright (c) 1998 Robert Nordier 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms are freely 8 * permitted provided that the above copyright notice and this 9 * paragraph and the following disclaimer are duplicated in all 10 * such forms. 11 * 12 * This software is provided "AS IS" and without any express or 13 * implied warranties, including, without limitation, the implied 14 * warranties of merchantability and fitness for a particular 15 * purpose. 16 */ 17 18#include <sys/cdefs.h> |
| 19__FBSDID("$FreeBSD: head/sys/boot/arm/at91/boot2/boot2.c 235988 2012-05-25 09:36:39Z gleb $"); | 19__FBSDID("$FreeBSD: head/sys/boot/arm/at91/boot2/boot2.c 269111 2014-07-26 03:33:19Z ian $"); |
| 20 21#include <sys/param.h> 22#include <sys/disklabel.h> 23#include <sys/diskmbr.h> 24#include <sys/dirent.h> 25#include <sys/reboot.h> 26 27#include <machine/elf.h> --- 60 unchanged lines hidden (view full) --- 88 89unsigned board_id; /* board type to pass to kernel, if set by board_* code */ 90unsigned dsk_start; 91static char cmd[512]; 92static char kname[1024]; 93static uint32_t opts; 94static uint8_t dsk_meta; 95 | 20 21#include <sys/param.h> 22#include <sys/disklabel.h> 23#include <sys/diskmbr.h> 24#include <sys/dirent.h> 25#include <sys/reboot.h> 26 27#include <machine/elf.h> --- 60 unchanged lines hidden (view full) --- 88 89unsigned board_id; /* board type to pass to kernel, if set by board_* code */ 90unsigned dsk_start; 91static char cmd[512]; 92static char kname[1024]; 93static uint32_t opts; 94static uint8_t dsk_meta; 95 |
| 96int main(void); |
|
| 96static void load(void); 97static int parse(void); 98static int dskread(void *, unsigned, unsigned); 99#ifdef FIXUP_BOOT_DRV 100static void fixup_boot_drv(caddr_t, int, int, int); 101#endif 102 103#define UFS_SMALL_CGBASE --- 81 unchanged lines hidden (view full) --- 185 xputchar('\n'); 186 autoboot = 0; 187 c = 0; 188 if (parse()) 189 xputchar('\a'); 190 else 191 load(); 192 } | 97static void load(void); 98static int parse(void); 99static int dskread(void *, unsigned, unsigned); 100#ifdef FIXUP_BOOT_DRV 101static void fixup_boot_drv(caddr_t, int, int, int); 102#endif 103 104#define UFS_SMALL_CGBASE --- 81 unchanged lines hidden (view full) --- 186 xputchar('\n'); 187 autoboot = 0; 188 c = 0; 189 if (parse()) 190 xputchar('\a'); 191 else 192 load(); 193 } |
| 194 return (1); |
|
| 193} 194 195static void 196load(void) 197{ 198 Elf32_Ehdr eh; 199 static Elf32_Phdr ep[2]; 200 caddr_t p; --- 195 unchanged lines hidden --- | 195} 196 197static void 198load(void) 199{ 200 Elf32_Ehdr eh; 201 static Elf32_Phdr ep[2]; 202 caddr_t p; --- 195 unchanged lines hidden --- |