b47efe305a
Add `linux.mod' and `multiboot.mod' so linux and multiboot kernels can be loaded from normal mode. * conf/i386-pc.rmk (pkgdata_MODULES): Add `linux.mod' and `multiboot.mod'. (linux_mod_SOURCES, linux_mod_CFLAGS, multiboot_mod_SOURCES) (multiboot_mod_CFLAGS): New variables. * loader/i386/pc/linux_normal.c: New file. * loader/i386/pc/multiboot_normal.c: Likewise. * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Don't use the attribute `unused'. * fs/ext2.c (grub_ext2_iterate_dir): Fix typos in inode type. Use `fdiro' to read the mode information from instead of `diro'. * fs/fshelp.c (grub_fshelp_find_file): Set type to foundtype after looking up a symlink. * include/grub/normal.h (GRUB_COMMAND_FLAG_NO_ARG_PARSE): New macro. * normal/command.c (grub_command_execute): Don't parse the arguments when `GRUB_COMMAND_FLAG_NO_ARG_PARSE' is set in the flags of the command. * normal/menu.c (grub_menu_run): Fix typo.
173 lines
5.2 KiB
Makefile
173 lines
5.2 KiB
Makefile
# -*- makefile -*-
|
|
|
|
COMMON_ASFLAGS = -nostdinc -fno-builtin
|
|
COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3
|
|
|
|
# Images.
|
|
pkgdata_IMAGES = boot.img diskboot.img kernel.img pxeboot.img
|
|
|
|
# For boot.img.
|
|
boot_img_SOURCES = boot/i386/pc/boot.S
|
|
boot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
boot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
|
|
|
|
# For pxeboot.img
|
|
pxeboot_img_SOURCES = boot/i386/pc/pxeboot.S
|
|
pxeboot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
pxeboot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8000
|
|
|
|
# For diskboot.img.
|
|
diskboot_img_SOURCES = boot/i386/pc/diskboot.S
|
|
diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
diskboot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8000
|
|
|
|
# For kernel.img.
|
|
kernel_img_SOURCES = kern/i386/pc/startup.S kern/main.c kern/device.c \
|
|
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
|
|
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
|
|
kern/i386/dl.c kern/i386/pc/init.c disk/i386/pc/partition.c \
|
|
kern/env.c disk/i386/pc/biosdisk.c \
|
|
term/i386/pc/console.c \
|
|
symlist.c
|
|
kernel_img_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
|
|
file.h fs.h kernel.h loader.h misc.h mm.h net.h rescue.h symbol.h \
|
|
term.h types.h machine/biosdisk.h machine/boot.h \
|
|
machine/console.h machine/init.h machine/memory.h \
|
|
machine/loader.h machine/partition.h machine/time.h machine/vga.h
|
|
kernel_img_CFLAGS = $(COMMON_CFLAGS)
|
|
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8200
|
|
|
|
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
|
|
DEFSYMFILES += kernel_syms.lst
|
|
|
|
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
|
|
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
|
|
|
|
kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
|
|
sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
|
|
|
|
# Utilities.
|
|
bin_UTILITIES = grub-mkimage
|
|
sbin_UTILITIES = grub-setup grub-emu
|
|
noinst_UTILITIES = genmoddep
|
|
|
|
# For grub-mkimage.
|
|
grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
|
|
util/resolve.c
|
|
grub_mkimage_LDFLAGS = -llzo
|
|
|
|
# For grub-setup.
|
|
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \
|
|
util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
|
|
kern/err.c kern/misc.c disk/i386/pc/partition.c fs/fat.c fs/ext2.c \
|
|
fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c fs/fshelp.c
|
|
|
|
# For grub
|
|
grub_emu_SOURCES = kern/main.c kern/device.c fs/fshelp.c \
|
|
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
|
|
kern/misc.c kern/loader.c kern/rescue.c kern/term.c \
|
|
disk/i386/pc/partition.c kern/env.c commands/ls.c \
|
|
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c \
|
|
util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c\
|
|
normal/cmdline.c normal/command.c normal/main.c normal/menu.c normal/arg.c \
|
|
util/console.c util/grub-emu.c util/misc.c util/i386/pc/getroot.c
|
|
grub_emu_LDFLAGS = -lncurses
|
|
|
|
# For genmoddep.
|
|
genmoddep_SOURCES = util/genmoddep.c
|
|
|
|
# Modules.
|
|
pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
|
|
hfs.mod jfs.mod normal.mod hello.mod vga.mod font.mod _multiboot.mod ls.mod \
|
|
boot.mod cmp.mod cat.mod terminal.mod fshelp.mod chain.mod multiboot.mod
|
|
|
|
# For _chain.mod.
|
|
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
|
_chain_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For chain.mod.
|
|
chain_mod_SOURCES = loader/i386/pc/chainloader_normal.c
|
|
chain_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For fshelp.mod.
|
|
fshelp_mod_SOURCES = fs/fshelp.c
|
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For fat.mod.
|
|
fat_mod_SOURCES = fs/fat.c
|
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ext2.mod.
|
|
ext2_mod_SOURCES = fs/ext2.c
|
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ufs.mod.
|
|
ufs_mod_SOURCES = fs/ufs.c
|
|
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For minix.mod.
|
|
minix_mod_SOURCES = fs/minix.c
|
|
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For hfs.mod.
|
|
hfs_mod_SOURCES = fs/hfs.c
|
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For jfs.mod.
|
|
jfs_mod_SOURCES = fs/jfs.c
|
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For _linux.mod.
|
|
_linux_mod_SOURCES = loader/i386/pc/linux.c
|
|
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For linux.mod.
|
|
linux_mod_SOURCES = loader/i386/pc/linux_normal.c
|
|
linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For normal.mod.
|
|
normal_mod_SOURCES = normal/cmdline.c normal/command.c normal/main.c \
|
|
normal/menu.c normal/arg.c normal/i386/setjmp.S
|
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
# For hello.mod.
|
|
hello_mod_SOURCES = hello/hello.c
|
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For boot.mod.
|
|
boot_mod_SOURCES = commands/boot.c
|
|
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For terminal.mod.
|
|
terminal_mod_SOURCES = commands/terminal.c
|
|
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ls.mod.
|
|
ls_mod_SOURCES = commands/ls.c
|
|
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For cmp.mod.
|
|
cmp_mod_SOURCES = commands/cmp.c
|
|
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For cat.mod.
|
|
cat_mod_SOURCES = commands/cat.c
|
|
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For vga.mod.
|
|
vga_mod_SOURCES = term/i386/pc/vga.c
|
|
vga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For font.mod.
|
|
font_mod_SOURCES = font/manager.c
|
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For _multiboot.mod.
|
|
_multiboot_mod_SOURCES = loader/i386/pc/multiboot.c
|
|
_multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For multiboot.mod.
|
|
multiboot_mod_SOURCES = loader/i386/pc/multiboot_normal.c
|
|
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|