d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix r223695 to compile on architectures which don't use the MBR scheme; wrap

Browse Source 
the MBR support in the common part of the loader in #ifdef's and enable it
only for userboot for now.
This commit is contained in:
Marius Strobl 2011-07-01 18:31:59 +00:00
parent 07b1b59405
commit 7d7a4ae1a7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=223712
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/boot/common/disk.c
View File

@ -93,6 +93,8 @@ static uuid_t ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
#endif #endif
#if defined(LOADER_GPT_SUPPORT) || defined(LOADER_MBR_SUPPORT)
/* Given a size in 512 byte sectors, convert it to a human-readable number. */ /* Given a size in 512 byte sectors, convert it to a human-readable number. */
static char * static char *
display_size(uint64_t size) display_size(uint64_t size)
@ -116,6 +118,10 @@ display_size(uint64_t size)
return (buf); return (buf);
} }
#endif
#ifdef LOADER_MBR_SUPPORT
static void static void
disk_checkextended(struct disk_devdesc *dev, disk_checkextended(struct disk_devdesc *dev,
struct dos_partition *slicetab, int slicenum, int *nslicesp) struct dos_partition *slicetab, int slicenum, int *nslicesp)
@ -469,7 +475,7 @@ disk_printslice(struct disk_devdesc *dev, int slice,
pager_output(line); pager_output(line);
} }
int static int
disk_printmbr(struct disk_devdesc *dev, char *prefix, int verbose) disk_printmbr(struct disk_devdesc *dev, char *prefix, int verbose)
{ {
struct dos_partition *slicetab; struct dos_partition *slicetab;
@ -488,6 +494,8 @@ disk_printmbr(struct disk_devdesc *dev, char *prefix, int verbose)
return (0); return (0);
} }
#endif
#ifdef LOADER_GPT_SUPPORT #ifdef LOADER_GPT_SUPPORT
static int static int
@ -630,7 +638,7 @@ disk_bestgpt(struct gpt_part *gpt, int ngpt)
return (prefpart); return (prefpart);
} }
int static int
disk_opengpt(struct disk_devdesc *dev) disk_opengpt(struct disk_devdesc *dev)
{ {
struct gpt_part *gpt = NULL, *gp; struct gpt_part *gpt = NULL, *gp;
@ -759,6 +767,7 @@ disk_open(struct disk_devdesc *dev)
{ {
int rc; int rc;
rc = 0;
/* /*
* While we are reading disk metadata, make sure we do it relative * While we are reading disk metadata, make sure we do it relative
* to the start of the disk * to the start of the disk
@ -769,7 +778,9 @@ disk_open(struct disk_devdesc *dev)
rc = disk_opengpt(dev); rc = disk_opengpt(dev);
if (rc) if (rc)
#endif #endif
#ifdef LOADER_MBR_SUPPORT
rc = disk_openmbr(dev); rc = disk_openmbr(dev);
#endif
return (rc); return (rc);
} }
@ -777,12 +788,12 @@ disk_open(struct disk_devdesc *dev)
void void
disk_print(struct disk_devdesc *dev, char *prefix, int verbose) disk_print(struct disk_devdesc *dev, char *prefix, int verbose)
{ {
int rc;
#ifdef LOADER_GPT_SUPPORT #ifdef LOADER_GPT_SUPPORT
rc = disk_printgpt(dev, prefix, verbose); if (disk_printgpt(dev, prefix, verbose) == 0)
if (rc == 0)
return; return;
#endif #endif
#ifdef LOADER_MBR_SUPPORT
disk_printmbr(dev, prefix, verbose); disk_printmbr(dev, prefix, verbose);
#endif
} }

2
sys/boot/userboot/userboot/Makefile
View File

@ -32,7 +32,7 @@ CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
CFLAGS+= -ffreestanding -I. CFLAGS+= -ffreestanding -I.
CFLAGS+= -DLOADER_GPT_SUPPORT CFLAGS+= -DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT
LDFLAGS+= -nostdlib -Wl,-Bsymbolic LDFLAGS+= -nostdlib -Wl,-Bsymbolic