vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_
	and grub_, respectively. Because the conversion is trivial and
	mechanical, I omit the details here. Please refer to the CVS
	if you need more information.
This commit is contained in:
okuji 2004-04-04 13:46:03 +00:00
parent 6a1425510d
commit 4b13b216f4
125 changed files with 6198 additions and 6181 deletions
Download patch file Download diff file Expand all files Collapse all files

132
util/i386/pc/grub-mkimage.c
View file

@ -1,9 +1,9 @@
/* pupa-mkimage.c - make a bootable image */
/* grub-mkimage.c - make a bootable image */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
*
* PUPA is free software; you can redistribute it and/or modify
* GRUB is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
@ -14,18 +14,18 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with PUPA; if not, write to the Free Software
* along with GRUB; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
#include <pupa/types.h>
#include <pupa/machine/boot.h>
#include <pupa/machine/kernel.h>
#include <pupa/kernel.h>
#include <pupa/disk.h>
#include <pupa/util/misc.h>
#include <pupa/util/resolve.h>
#include <grub/types.h>
#include <grub/machine/boot.h>
#include <grub/machine/kernel.h>
#include <grub/kernel.h>
#include <grub/disk.h>
#include <grub/util/misc.h>
#include <grub/util/resolve.h>
#include <stdio.h>
#include <unistd.h>
@ -44,69 +44,69 @@ compress_kernel (char *kernel_img, size_t kernel_size,
lzo_uint size;
char *wrkmem;
pupa_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
if (kernel_size < PUPA_KERNEL_MACHINE_RAW_SIZE)
pupa_util_error ("the core image is too small");
grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
if (kernel_size < GRUB_KERNEL_MACHINE_RAW_SIZE)
grub_util_error ("the core image is too small");
if (lzo_init () != LZO_E_OK)
pupa_util_error ("cannot initialize LZO");
grub_util_error ("cannot initialize LZO");
*core_img = xmalloc (kernel_size + kernel_size / 64 + 16 + 3);
wrkmem = xmalloc (LZO1X_999_MEM_COMPRESS);
memcpy (*core_img, kernel_img, PUPA_KERNEL_MACHINE_RAW_SIZE);
memcpy (*core_img, kernel_img, GRUB_KERNEL_MACHINE_RAW_SIZE);
pupa_util_info ("compressing the core image");
if (lzo1x_999_compress (kernel_img + PUPA_KERNEL_MACHINE_RAW_SIZE,
kernel_size - PUPA_KERNEL_MACHINE_RAW_SIZE,
*core_img + PUPA_KERNEL_MACHINE_RAW_SIZE,
grub_util_info ("compressing the core image");
if (lzo1x_999_compress (kernel_img + GRUB_KERNEL_MACHINE_RAW_SIZE,
kernel_size - GRUB_KERNEL_MACHINE_RAW_SIZE,
*core_img + GRUB_KERNEL_MACHINE_RAW_SIZE,
&size, wrkmem)
!= LZO_E_OK)
pupa_util_error ("cannot compress the kernel image");
grub_util_error ("cannot compress the kernel image");
free (wrkmem);
*core_size = (size_t) size + PUPA_KERNEL_MACHINE_RAW_SIZE;
*core_size = (size_t) size + GRUB_KERNEL_MACHINE_RAW_SIZE;
}
static void
generate_image (const char *dir, FILE *out, char *mods[])
{
pupa_addr_t module_addr = 0;
grub_addr_t module_addr = 0;
char *kernel_img, *boot_img, *core_img;
size_t kernel_size, boot_size, total_module_size, core_size;
char *kernel_path, *boot_path;
unsigned num;
size_t offset;
struct pupa_util_path_list *path_list, *p, *next;
struct grub_util_path_list *path_list, *p, *next;
path_list = pupa_util_resolve_dependencies (dir, "moddep.lst", mods);
path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
kernel_path = pupa_util_get_path (dir, "kernel.img");
kernel_size = pupa_util_get_image_size (kernel_path);
kernel_path = grub_util_get_path (dir, "kernel.img");
kernel_size = grub_util_get_image_size (kernel_path);
total_module_size = 0;
for (p = path_list; p; p = p->next)
total_module_size += (pupa_util_get_image_size (p->name)
+ sizeof (struct pupa_module_header));
total_module_size += (grub_util_get_image_size (p->name)
+ sizeof (struct grub_module_header));
pupa_util_info ("the total module size is 0x%x", total_module_size);
grub_util_info ("the total module size is 0x%x", total_module_size);
kernel_img = xmalloc (kernel_size + total_module_size);
pupa_util_load_image (kernel_path, kernel_img);
grub_util_load_image (kernel_path, kernel_img);
offset = kernel_size;
for (p = path_list; p; p = p->next)
{
struct pupa_module_header *header;
struct grub_module_header *header;
size_t mod_size;
mod_size = pupa_util_get_image_size (p->name);
mod_size = grub_util_get_image_size (p->name);
header = (struct pupa_module_header *) (kernel_img + offset);
header->offset = pupa_cpu_to_le32 (sizeof (*header));
header->size = pupa_cpu_to_le32 (mod_size + sizeof (*header));
header = (struct grub_module_header *) (kernel_img + offset);
header->offset = grub_cpu_to_le32 (sizeof (*header));
header->size = grub_cpu_to_le32 (mod_size + sizeof (*header));
pupa_util_load_image (p->name, kernel_img + offset + sizeof (*header));
grub_util_load_image (p->name, kernel_img + offset + sizeof (*header));
offset += sizeof (*header) + mod_size;
}
@ -114,42 +114,42 @@ generate_image (const char *dir, FILE *out, char *mods[])
compress_kernel (kernel_img, kernel_size + total_module_size,
&core_img, &core_size);
pupa_util_info ("the core size is 0x%x", core_size);
grub_util_info ("the core size is 0x%x", core_size);
num = ((core_size + PUPA_DISK_SECTOR_SIZE - 1) >> PUPA_DISK_SECTOR_BITS);
num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
if (num > 0xffff)
pupa_util_error ("the core image is too big");
grub_util_error ("the core image is too big");
boot_path = pupa_util_get_path (dir, "diskboot.img");
boot_size = pupa_util_get_image_size (boot_path);
if (boot_size != PUPA_DISK_SECTOR_SIZE)
pupa_util_error ("diskboot.img is not one sector size");
boot_path = grub_util_get_path (dir, "diskboot.img");
boot_size = grub_util_get_image_size (boot_path);
if (boot_size != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("diskboot.img is not one sector size");
boot_img = pupa_util_read_image (boot_path);
boot_img = grub_util_read_image (boot_path);
/* i386 is a little endian architecture. */
*((pupa_uint16_t *) (boot_img + PUPA_DISK_SECTOR_SIZE
- PUPA_BOOT_MACHINE_LIST_SIZE + 4))
= pupa_cpu_to_le16 (num);
*((grub_uint16_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
- GRUB_BOOT_MACHINE_LIST_SIZE + 4))
= grub_cpu_to_le16 (num);
pupa_util_write_image (boot_img, boot_size, out);
grub_util_write_image (boot_img, boot_size, out);
free (boot_img);
free (boot_path);
module_addr = (path_list
? (PUPA_BOOT_MACHINE_KERNEL_ADDR + PUPA_DISK_SECTOR_SIZE
? (GRUB_BOOT_MACHINE_KERNEL_ADDR + GRUB_DISK_SECTOR_SIZE
+ kernel_size)
: 0);
pupa_util_info ("the first module address is 0x%x", module_addr);
*((pupa_uint32_t *) (core_img + PUPA_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
= pupa_cpu_to_le32 (total_module_size);
*((pupa_uint32_t *) (core_img + PUPA_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
= pupa_cpu_to_le32 (kernel_size);
*((pupa_uint32_t *) (core_img + PUPA_KERNEL_MACHINE_COMPRESSED_SIZE))
= pupa_cpu_to_le32 (core_size - PUPA_KERNEL_MACHINE_RAW_SIZE);
grub_util_info ("the first module address is 0x%x", module_addr);
*((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
= grub_cpu_to_le32 (total_module_size);
*((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
= grub_cpu_to_le32 (kernel_size);
*((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
= grub_cpu_to_le32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
pupa_util_write_image (core_img, core_size, out);
grub_util_write_image (core_img, core_size, out);
free (kernel_img);
free (core_img);
free (kernel_path);
@ -179,12 +179,12 @@ static void
usage (int status)
{
if (status)
fprintf (stderr, "Try ``pupa-mkimage --help'' for more information.\n");
fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n");
else
printf ("\
Usage: pupa-mkimage [OPTION]... [MODULES]\n\
Usage: grub-mkimage [OPTION]... [MODULES]\n\
\n\
Make a bootable image of PUPA.\n\
Make a bootable image of GRUB.\n\
\n\
-d, --directory=DIR use images and modules under DIR [default=%s]\n\
-o, --output=FILE output a generated image to FILE [default=stdout]\n\
@ -193,7 +193,7 @@ Make a bootable image of PUPA.\n\
-v, --verbose print verbose messages\n\
\n\
Report bugs to <%s>.\n\
", PUPA_DATADIR, PACKAGE_BUGREPORT);
", GRUB_DATADIR, PACKAGE_BUGREPORT);
exit (status);
}
@ -205,7 +205,7 @@ main (int argc, char *argv[])
char *dir = 0;
FILE *fp = stdout;
progname = "pupa-mkimage";
progname = "grub-mkimage";
while (1)
{
@ -235,7 +235,7 @@ main (int argc, char *argv[])
break;
case 'V':
printf ("pupa-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
return 0;
case 'v':
@ -252,10 +252,10 @@ main (int argc, char *argv[])
{
fp = fopen (output, "wb");
if (! fp)
pupa_util_error ("cannot open %s", output);
grub_util_error ("cannot open %s", output);
}
generate_image (dir ? : PUPA_DATADIR, fp, argv + optind);
generate_image (dir ? : GRUB_DATADIR, fp, argv + optind);
fclose (fp);