merge sparc grub-mkimage into grub-mkrawimage
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
7cae4377a2
commit
6bea3f8983
5 changed files with 35 additions and 304 deletions
|
|
@ -62,7 +62,7 @@ bin_UTILITIES = grub-mkimage
|
||||||
sbin_UTILITIES = grub-setup grub-ofpathname
|
sbin_UTILITIES = grub-setup grub-ofpathname
|
||||||
|
|
||||||
# For grub-mkimage.
|
# For grub-mkimage.
|
||||||
grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
|
grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
|
||||||
util/resolve.c gnulib/progname.c
|
util/resolve.c gnulib/progname.c
|
||||||
|
|
||||||
# For grub-setup.
|
# For grub-setup.
|
||||||
|
|
|
||||||
|
|
@ -138,9 +138,14 @@ case "$platform" in
|
||||||
qemu) machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
|
qemu) machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
|
||||||
pc) machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
|
pc) machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
|
||||||
emu) machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
|
emu) machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
|
||||||
yeeloong) machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
|
yeeloong) machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
|
||||||
qemu-mips) machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
|
qemu-mips) machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
|
||||||
esac
|
esac
|
||||||
|
case "$target_cpu" in
|
||||||
|
mips) machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
|
||||||
|
sparc64) machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
CFLAGS="$CFLAGS $machine_CFLAGS"
|
CFLAGS="$CFLAGS $machine_CFLAGS"
|
||||||
TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
|
TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
|
||||||
TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
|
TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,8 @@
|
||||||
/* End of the data section. */
|
/* End of the data section. */
|
||||||
#define GRUB_KERNEL_MACHINE_DATA_END 0x114
|
#define GRUB_KERNEL_MACHINE_DATA_END 0x114
|
||||||
|
|
||||||
|
#define GRUB_KERNEL_MACHINE_RAW_SIZE 0
|
||||||
|
|
||||||
#ifndef ASM_FILE
|
#ifndef ASM_FILE
|
||||||
|
|
||||||
#include <grub/symbol.h>
|
#include <grub/symbol.h>
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
|
||||||
}
|
}
|
||||||
|
|
||||||
for (p = path_list; p; p = p->next)
|
for (p = path_list; p; p = p->next)
|
||||||
total_module_size += (grub_util_get_image_size (p->name)
|
total_module_size += (ALIGN_UP (grub_util_get_image_size (p->name), 4)
|
||||||
+ sizeof (struct grub_module_header));
|
+ sizeof (struct grub_module_header));
|
||||||
|
|
||||||
grub_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);
|
||||||
|
|
@ -295,6 +295,30 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
|
||||||
core_img = rom_img;
|
core_img = rom_img;
|
||||||
core_size = rom_size;
|
core_size = rom_size;
|
||||||
|
|
||||||
|
free (boot_img);
|
||||||
|
free (boot_path);
|
||||||
|
}
|
||||||
|
#elif defined (GRUB_MACHINE_SPARC64)
|
||||||
|
{
|
||||||
|
unsigned int num;
|
||||||
|
char *boot_path, *boot_img;
|
||||||
|
size_t boot_size;
|
||||||
|
|
||||||
|
num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
|
||||||
|
num <<= GRUB_DISK_SECTOR_BITS;
|
||||||
|
|
||||||
|
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 = grub_util_read_image (boot_path);
|
||||||
|
|
||||||
|
*((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
|
||||||
|
- GRUB_BOOT_MACHINE_LIST_SIZE + 8))
|
||||||
|
= grub_host_to_target32 (num);
|
||||||
|
|
||||||
|
grub_util_write_image (boot_img, boot_size, out);
|
||||||
free (boot_img);
|
free (boot_img);
|
||||||
free (boot_path);
|
free (boot_path);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,300 +0,0 @@
|
||||||
/* grub-mkimage.c - make a bootable image */
|
|
||||||
/*
|
|
||||||
* GRUB -- GRand Unified Bootloader
|
|
||||||
* Copyright (C) 2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
*
|
|
||||||
* 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 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* GRUB is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#include <config.h>
|
|
||||||
#include <grub/types.h>
|
|
||||||
#include <grub/machine/boot.h>
|
|
||||||
#include <grub/machine/kernel.h>
|
|
||||||
#include <grub/kernel.h>
|
|
||||||
#include <grub/i18n.h>
|
|
||||||
#include <grub/disk.h>
|
|
||||||
#include <grub/util/misc.h>
|
|
||||||
#include <grub/util/resolve.h>
|
|
||||||
#include <grub/misc.h>
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#define _GNU_SOURCE 1
|
|
||||||
#include <getopt.h>
|
|
||||||
|
|
||||||
#include "progname.h"
|
|
||||||
|
|
||||||
static void
|
|
||||||
compress_kernel (char *kernel_img, size_t kernel_size,
|
|
||||||
char **core_img, size_t *core_size)
|
|
||||||
{
|
|
||||||
/* No compression support yet. */
|
|
||||||
grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
|
|
||||||
*core_img = xmalloc (kernel_size);
|
|
||||||
memcpy (*core_img, kernel_img, kernel_size);
|
|
||||||
*core_size = kernel_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
generate_image (const char *dir, const char *prefix, FILE *out, char *mods[], char *memdisk_path)
|
|
||||||
{
|
|
||||||
size_t kernel_size, total_module_size, memdisk_size, core_size, boot_size, offset;
|
|
||||||
char *kernel_path, *kernel_img, *core_img, *boot_path, *boot_img;
|
|
||||||
struct grub_util_path_list *path_list, *p;
|
|
||||||
struct grub_module_info *modinfo;
|
|
||||||
grub_addr_t module_addr;
|
|
||||||
unsigned int num;
|
|
||||||
|
|
||||||
path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
|
|
||||||
|
|
||||||
kernel_path = grub_util_get_path (dir, "kernel.img");
|
|
||||||
kernel_size = grub_util_get_image_size (kernel_path);
|
|
||||||
|
|
||||||
total_module_size = sizeof (struct grub_module_info);
|
|
||||||
for (p = path_list; p; p = p->next)
|
|
||||||
total_module_size += (grub_util_get_image_size (p->name)
|
|
||||||
+ sizeof (struct grub_module_header));
|
|
||||||
|
|
||||||
memdisk_size = 0;
|
|
||||||
if (memdisk_path)
|
|
||||||
{
|
|
||||||
memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
|
|
||||||
grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
|
|
||||||
total_module_size += memdisk_size + sizeof (struct grub_module_header);
|
|
||||||
}
|
|
||||||
|
|
||||||
grub_util_info ("the total module size is 0x%x", total_module_size);
|
|
||||||
|
|
||||||
kernel_img = xmalloc (kernel_size + total_module_size);
|
|
||||||
grub_util_load_image (kernel_path, kernel_img);
|
|
||||||
|
|
||||||
if ((GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1)
|
|
||||||
> GRUB_KERNEL_MACHINE_DATA_END)
|
|
||||||
grub_util_error ("prefix too long");
|
|
||||||
strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
|
|
||||||
|
|
||||||
/* Fill in the grub_module_info structure. */
|
|
||||||
modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
|
|
||||||
modinfo->magic = GRUB_MODULE_MAGIC;
|
|
||||||
modinfo->offset = sizeof (struct grub_module_info);
|
|
||||||
modinfo->size = total_module_size;
|
|
||||||
|
|
||||||
offset = kernel_size + sizeof (struct grub_module_info);
|
|
||||||
for (p = path_list; p; p = p->next)
|
|
||||||
{
|
|
||||||
struct grub_module_header *header;
|
|
||||||
size_t mod_size;
|
|
||||||
|
|
||||||
mod_size = grub_util_get_image_size (p->name);
|
|
||||||
|
|
||||||
header = (struct grub_module_header *) (kernel_img + offset);
|
|
||||||
header->type = OBJ_TYPE_ELF;
|
|
||||||
header->size = grub_host_to_target32 (mod_size + sizeof (*header));
|
|
||||||
offset += sizeof (*header);
|
|
||||||
|
|
||||||
grub_util_load_image (p->name, kernel_img + offset);
|
|
||||||
offset += mod_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (memdisk_path)
|
|
||||||
{
|
|
||||||
struct grub_module_header *header;
|
|
||||||
|
|
||||||
header = (struct grub_module_header *) (kernel_img + offset);
|
|
||||||
header->type = OBJ_TYPE_MEMDISK;
|
|
||||||
header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
|
|
||||||
offset += sizeof (*header);
|
|
||||||
|
|
||||||
grub_util_load_image (memdisk_path, kernel_img + offset);
|
|
||||||
offset += memdisk_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
compress_kernel (kernel_img, kernel_size + total_module_size,
|
|
||||||
&core_img, &core_size);
|
|
||||||
|
|
||||||
grub_util_info ("the core size is 0x%x", core_size);
|
|
||||||
|
|
||||||
num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
|
|
||||||
num <<= GRUB_DISK_SECTOR_BITS;
|
|
||||||
|
|
||||||
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 = grub_util_read_image (boot_path);
|
|
||||||
|
|
||||||
/* sparc is a big endian architecture. */
|
|
||||||
*((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
|
|
||||||
- GRUB_BOOT_MACHINE_LIST_SIZE + 8))
|
|
||||||
= grub_cpu_to_be32 (num);
|
|
||||||
|
|
||||||
grub_util_write_image (boot_img, boot_size, out);
|
|
||||||
free (boot_img);
|
|
||||||
free (boot_path);
|
|
||||||
|
|
||||||
module_addr = (path_list
|
|
||||||
? (GRUB_BOOT_MACHINE_IMAGE_ADDRESS + kernel_size)
|
|
||||||
: 0);
|
|
||||||
|
|
||||||
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_be32 (total_module_size);
|
|
||||||
*((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
|
|
||||||
= grub_cpu_to_be32 (kernel_size);
|
|
||||||
|
|
||||||
/* No compression support yet. */
|
|
||||||
*((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
|
|
||||||
= grub_cpu_to_be32 (0);
|
|
||||||
|
|
||||||
grub_util_write_image (core_img, core_size, out);
|
|
||||||
free (kernel_img);
|
|
||||||
free (core_img);
|
|
||||||
free (kernel_path);
|
|
||||||
|
|
||||||
while (path_list)
|
|
||||||
{
|
|
||||||
struct grub_util_path_list *next = path_list->next;
|
|
||||||
free ((void *) path_list->name);
|
|
||||||
free (path_list);
|
|
||||||
path_list = next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct option options[] =
|
|
||||||
{
|
|
||||||
{"directory", required_argument, 0, 'd'},
|
|
||||||
{"prefix", required_argument, 0, 'p'},
|
|
||||||
{"memdisk", required_argument, 0, 'm'},
|
|
||||||
{"output", required_argument, 0, 'o'},
|
|
||||||
{"help", no_argument, 0, 'h'},
|
|
||||||
{"version", no_argument, 0, 'V'},
|
|
||||||
{"verbose", no_argument, 0, 'v'},
|
|
||||||
{0, 0, 0, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
static void
|
|
||||||
usage (int status)
|
|
||||||
{
|
|
||||||
if (status)
|
|
||||||
fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
|
|
||||||
else
|
|
||||||
printf ("\
|
|
||||||
Usage: %s [OPTION]... [MODULES]\n\
|
|
||||||
\n\
|
|
||||||
Make a bootable image of GRUB.\n\
|
|
||||||
\n\
|
|
||||||
-d, --directory=DIR use images and modules under DIR [default=%s]\n\
|
|
||||||
-p, --prefix=DIR set grub_prefix directory [default=%s]\n\
|
|
||||||
-m, --memdisk=FILE embed FILE as a memdisk image\n\
|
|
||||||
-o, --output=FILE output a generated image to FILE [default=stdout]\n\
|
|
||||||
-h, --help display this message and exit\n\
|
|
||||||
-V, --version print version information and exit\n\
|
|
||||||
-v, --verbose print verbose messages\n\
|
|
||||||
\n\
|
|
||||||
Report bugs to <%s>.\n\
|
|
||||||
", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
|
|
||||||
|
|
||||||
exit (status);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
main (int argc, char *argv[])
|
|
||||||
{
|
|
||||||
char *output = NULL;
|
|
||||||
char *dir = NULL;
|
|
||||||
char *prefix = NULL;
|
|
||||||
char *memdisk = NULL;
|
|
||||||
FILE *fp = stdout;
|
|
||||||
|
|
||||||
set_program_name (argv[0]);
|
|
||||||
|
|
||||||
grub_util_init_nls ();
|
|
||||||
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
int c = getopt_long (argc, argv, "d:p:m:o:hVv", options, 0);
|
|
||||||
|
|
||||||
if (c == -1)
|
|
||||||
break;
|
|
||||||
else
|
|
||||||
switch (c)
|
|
||||||
{
|
|
||||||
case 'o':
|
|
||||||
if (output)
|
|
||||||
free (output);
|
|
||||||
output = xstrdup (optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'd':
|
|
||||||
if (dir)
|
|
||||||
free (dir);
|
|
||||||
dir = xstrdup (optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'm':
|
|
||||||
if (memdisk)
|
|
||||||
free (memdisk);
|
|
||||||
memdisk = xstrdup (optarg);
|
|
||||||
|
|
||||||
if (prefix)
|
|
||||||
free (prefix);
|
|
||||||
prefix = xstrdup ("(memdisk)/boot/grub");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'h':
|
|
||||||
usage (0);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'p':
|
|
||||||
if (prefix)
|
|
||||||
free (prefix);
|
|
||||||
prefix = xstrdup (optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'V':
|
|
||||||
printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
case 'v':
|
|
||||||
verbosity++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
usage (1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (output)
|
|
||||||
{
|
|
||||||
fp = fopen (output, "wb");
|
|
||||||
if (! fp)
|
|
||||||
grub_util_error ("cannot open %s", output);
|
|
||||||
}
|
|
||||||
|
|
||||||
generate_image (dir ? : GRUB_LIBDIR,
|
|
||||||
prefix ? : DEFAULT_DIRECTORY, fp,
|
|
||||||
argv + optind, memdisk);
|
|
||||||
|
|
||||||
fclose (fp);
|
|
||||||
|
|
||||||
if (dir)
|
|
||||||
free (dir);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue