2007-10-31 22:35:13 +00:00
|
|
|
# -*- makefile -*-
|
|
|
|
|
|
2008-08-04 11:38:45 +00:00
|
|
|
COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
|
|
|
|
|
COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
|
|
|
|
|
COMMON_LDFLAGS = -m32 -nostdlib
|
2007-10-31 22:35:13 +00:00
|
|
|
|
2008-02-01 15:45:17 +00:00
|
|
|
# Used by various components. These rules need to precede them.
|
2008-02-24 15:06:30 +00:00
|
|
|
normal/lexer.c_DEPENDENCIES = grub_script.tab.h
|
2008-02-01 15:45:17 +00:00
|
|
|
|
2007-10-31 22:35:13 +00:00
|
|
|
# Images.
|
2007-12-25 09:09:43 +00:00
|
|
|
pkglib_PROGRAMS = kernel.elf
|
2007-10-31 22:35:13 +00:00
|
|
|
|
|
|
|
|
# For kernel.elf.
|
2008-08-11 14:57:39 +00:00
|
|
|
kernel_elf_SOURCES = kern/i386/coreboot/startup.S \
|
|
|
|
|
kern/i386/coreboot/init.c \
|
2008-11-11 23:27:18 +00:00
|
|
|
kern/i386/multiboot_mmap.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
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 \
|
2009-03-01 17:51:44 +00:00
|
|
|
kern/time.c kern/list.c kern/handler.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
kern/i386/dl.c kern/parser.c kern/partition.c \
|
2008-08-05 20:24:00 +00:00
|
|
|
kern/i386/tsc.c kern/i386/pit.c \
|
|
|
|
|
kern/generic/rtc_get_time_ms.c \
|
|
|
|
|
kern/generic/millisleep.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
kern/env.c \
|
2008-11-12 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (kernel_img_SOURCES): Add `term/i386/vga_common.c'.
* conf/i386.rmk (pkglib_MODULES): Add `vga_text.mod'.
(vga_text_mod_SOURCES, vga_text_mod_CFLAGS, vga_text_mod_LDFLAGS): New
variables.
* conf/i386-coreboot.rmk (kernel_elf_SOURCES): Replace
`term/i386/pc/console.c' with `term/i386/vga_common.c'.
* kern/i386/coreboot/init.c (grub_machine_init): Replace call to
grub_console_init() with call to grub_vga_text_init().
(grub_machine_fini): Replace call to
grub_console_fini() with call to grub_vga_text_fini() and
grub_at_keyboard_fini().
* include/grub/i386/pc/console.h: Include `<grub/term.h>'.
(grub_console_putchar, grub_console_getcharwidth, grub_console_getwh)
(grub_console_setcolorstate, grub_console_setcolor)
(grub_console_getcolor): New function prototypes.
* term/i386/pc/vga_text.c: Include `<grub/dl.h>'.
(grub_vga_text_getxy, grub_vga_text_gotoxy, grub_vga_text_cls)
(grub_vga_text_setcursor): Static-ize.
(grub_vga_text_term): New structure.
(GRUB_MOD_INIT(vga_text), GRUB_MOD_FINI(vga_text)): New functions.
* term/i386/pc/console.c: Remove `<grub/machine/machine.h>'.
(grub_console_cur_color, grub_console_standard_color)
(grub_console_normal_color, grub_console_highlight_color)
(map_char, grub_console_putchar, grub_console_getcharwidth)
(grub_console_getwh, grub_console_setcolorstate, grub_console_setcolor)
(grub_console_getcolor): Move from here ...
* term/i386/vga_common.c: ... to here (same function names).
2008-11-12 15:02:17 +00:00
|
|
|
term/i386/pc/vga_text.c term/i386/vga_common.c \
|
|
|
|
|
term/i386/pc/at_keyboard.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
symlist.c
|
|
|
|
|
kernel_elf_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
|
|
|
|
|
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
|
|
|
|
|
partition.h pc_partition.h rescue.h symbol.h term.h time.h types.h \
|
|
|
|
|
machine/boot.h machine/console.h machine/init.h \
|
2009-03-01 17:51:44 +00:00
|
|
|
machine/memory.h machine/loader.h list.h handler.h
|
2007-10-31 22:35:13 +00:00
|
|
|
kernel_elf_CFLAGS = $(COMMON_CFLAGS)
|
2008-08-06 12:27:28 +00:00
|
|
|
kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
|
2007-10-31 22:35:13 +00:00
|
|
|
kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
|
|
|
|
|
|
|
|
|
|
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
|
|
|
|
|
DEFSYMFILES += kernel_syms.lst
|
|
|
|
|
|
|
|
|
|
symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh
|
|
|
|
|
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
|
|
|
|
kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh
|
|
|
|
|
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
|
|
|
|
# Utilities.
|
2008-01-30 15:32:56 +00:00
|
|
|
sbin_UTILITIES = grub-mkdevicemap
|
2007-10-31 22:35:13 +00:00
|
|
|
ifeq ($(enable_grub_emu), yes)
|
|
|
|
|
sbin_UTILITIES += grub-emu
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# For grub-mkdevicemap.
|
2008-09-25 14:15:24 +00:00
|
|
|
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
|
2007-10-31 22:35:13 +00:00
|
|
|
|
|
|
|
|
# For grub-emu.
|
2008-01-27 22:44:02 +00:00
|
|
|
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
|
2007-10-31 22:35:13 +00:00
|
|
|
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|
|
|
|
commands/configfile.c commands/echo.c commands/help.c \
|
2009-03-01 17:51:44 +00:00
|
|
|
commands/handler.c commands/ls.c commands/test.c \
|
2007-11-18 06:41:46 +00:00
|
|
|
commands/search.c commands/blocklist.c commands/hexdump.c \
|
2008-07-27 13:51:30 +00:00
|
|
|
lib/hexdump.c commands/i386/cpuid.c \
|
2008-02-10 20:00:37 +00:00
|
|
|
disk/host.c disk/loopback.c \
|
2008-01-25 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES, grub_emu_SOURCES): Regroup to
make all filesystem sources appear together (possibly fixing omissions
while at it).
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_probe_SOURCES): Likewise. Additionally,
add `kern/file.c'.
* conf/i386-efi.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_probe_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* util/grub-probe.c: Include `<grub/file.h>' and `<sys/stat.h>'.
(probe): Add a sanity check to make sure of our ability to read
requested files when probing for filesystem type.
* genmk.rb: Update copyright year (2007).
* include/grub/fs.h (grub_fat_init, grub_fat_fini, grub_ext2_init)
(grub_ext2_fini, grub_ufs_init, grub_ufs_fini, grub_minix_init)
(grub_minix_fini, grub_hfs_init, grub_hfs_fini, grub_jfs_init)
(grub_jfs_fini, grub_xfs_init, grub_xfs_fini, grub_affs_init)
(grub_affs_fini, grub_sfs_init, grub_sfs_fini, grub_iso9660_init)
: Remove function prototypes.
2008-01-25 22:33:57 +00:00
|
|
|
\
|
2009-02-09 18:00:36 +00:00
|
|
|
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
|
2008-02-24 15:34:15 +00:00
|
|
|
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
|
2008-01-25 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES, grub_emu_SOURCES): Regroup to
make all filesystem sources appear together (possibly fixing omissions
while at it).
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_probe_SOURCES): Likewise. Additionally,
add `kern/file.c'.
* conf/i386-efi.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_probe_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* util/grub-probe.c: Include `<grub/file.h>' and `<sys/stat.h>'.
(probe): Add a sanity check to make sure of our ability to read
requested files when probing for filesystem type.
* genmk.rb: Update copyright year (2007).
* include/grub/fs.h (grub_fat_init, grub_fat_fini, grub_ext2_init)
(grub_ext2_fini, grub_ufs_init, grub_ufs_fini, grub_minix_init)
(grub_minix_fini, grub_hfs_init, grub_hfs_fini, grub_jfs_init)
(grub_jfs_fini, grub_xfs_init, grub_xfs_fini, grub_affs_init)
(grub_affs_fini, grub_sfs_init, grub_sfs_fini, grub_iso9660_init)
: Remove function prototypes.
2008-01-25 22:33:57 +00:00
|
|
|
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
|
2009-02-07 23:38:01 +00:00
|
|
|
fs/ufs.c fs/xfs.c fs/afs.c fs/tar.c \
|
2008-01-25 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES, grub_emu_SOURCES): Regroup to
make all filesystem sources appear together (possibly fixing omissions
while at it).
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-pc.rmk (grub_probe_SOURCES): Likewise. Additionally,
add `kern/file.c'.
* conf/i386-efi.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_probe_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_probe_SOURCES): Likewise.
* util/grub-probe.c: Include `<grub/file.h>' and `<sys/stat.h>'.
(probe): Add a sanity check to make sure of our ability to read
requested files when probing for filesystem type.
* genmk.rb: Update copyright year (2007).
* include/grub/fs.h (grub_fat_init, grub_fat_fini, grub_ext2_init)
(grub_ext2_fini, grub_ufs_init, grub_ufs_fini, grub_minix_init)
(grub_minix_fini, grub_hfs_init, grub_hfs_fini, grub_jfs_init)
(grub_jfs_fini, grub_xfs_init, grub_xfs_fini, grub_affs_init)
(grub_affs_fini, grub_sfs_init, grub_sfs_fini, grub_iso9660_init)
: Remove function prototypes.
2008-01-25 22:33:57 +00:00
|
|
|
\
|
|
|
|
|
fs/fshelp.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
io/gzio.c \
|
|
|
|
|
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
|
|
|
|
|
kern/err.c \
|
|
|
|
|
normal/execute.c kern/file.c kern/fs.c normal/lexer.c \
|
|
|
|
|
kern/loader.c kern/main.c kern/misc.c kern/parser.c \
|
|
|
|
|
grub_script.tab.c kern/partition.c kern/rescue.c kern/term.c \
|
|
|
|
|
normal/arg.c normal/cmdline.c normal/command.c normal/function.c\
|
2009-02-13 20:06:27 +00:00
|
|
|
normal/completion.c normal/main.c normal/menu_text.c \
|
2009-02-03 13:22:26 +00:00
|
|
|
normal/menu.c normal/menu_entry.c normal/menu_viewer.c \
|
|
|
|
|
normal/misc.c normal/script.c \
|
2008-01-05 12:10:28 +00:00
|
|
|
normal/color.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
|
|
|
|
|
partmap/acorn.c partmap/gpt.c \
|
|
|
|
|
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
|
2008-09-08 13:52:30 +00:00
|
|
|
util/hostdisk.c util/getroot.c \
|
2008-02-10 20:00:37 +00:00
|
|
|
util/i386/pc/misc.c \
|
|
|
|
|
\
|
2008-08-23 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
dm_nv.mod.
(raid5rec_mod_SOURCES): New macro.
(raid5rec_mod_CFLAGS): Likewise.
(raid5rec_mod_LDFLAGS): Likewise.
(raid6rec_mod_SOURCES): Likewise.
(raid6rec_mod_CFLAGS): Likewise.
(raid6rec_mod_LDFLAGS): Likewise.
(mdraid_mod_SOURCES): Likewise.
(mdraid_mod_CFLAGS): Likewise.
(mdraid_mod_LDFLAGS): Likewise.
(dm_nv_mod_SOURCES): Likewise.
(dm_nv_mod_CFLAGS): Likewise.
(dm_nv_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
(grub_emu_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* disk/raid5_recover.c: New file.
* disk/raid6_recover.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
ULONG_MAX.
* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
calculate the size of raid device.
(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
different layout of raid5.
(grub_raid_scan_device): Remove code specific to mdraid.
(grub_raid_list): New variable.
(free_array): New function.
(grub_raid_register): Likewise.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(GRUB_MOD_INIT): Don't iterate device here.
(GRUB_MOD_FINI): Use free_array to release resource.
* include/grub/raid.h: Remove macro and structure specific to mdraid.
(grub_raid5_recover_func_t): New function variable type.
(grub_raid6_recover_func_t): Likewise.
(grub_raid5_recover_func): New variable.
(grub_raid6_recover_func): Likewise.
(grub_raid_register): New function.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(grub_raid_block_xor): Likewise.
* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
(CMD_CRC): New macro.
(part): Removed.
(read_file): Handle device as well as file.
(cmd_crc): New function.
(fstest): Handle multiple disks.
(options): Remove part, raw and long, add root and diskcount.
(usage): Add crc, remove -p, -r, -l, add -r and -c.
(main): Find the first non option entry and ignore subsequence options,
add handling for the new options, support multiple disks.
* util/grub-probe.c (probe): Add mdraid to abstraction_name.
2008-08-23 14:51:19 +00:00
|
|
|
disk/raid.c disk/raid5_recover.c disk/raid6_recover.c \
|
|
|
|
|
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
|
2008-02-10 20:00:37 +00:00
|
|
|
grub_emu_init.c
|
2007-10-31 22:35:13 +00:00
|
|
|
|
|
|
|
|
grub_emu_LDFLAGS = $(LIBCURSES)
|
|
|
|
|
|
2008-11-28 20:06:55 +00:00
|
|
|
sbin_SCRIPTS += grub-install
|
|
|
|
|
grub_install_SOURCES = util/i386/pc/grub-install.in
|
|
|
|
|
|
2007-10-31 22:35:13 +00:00
|
|
|
# Modules.
|
2007-12-25 09:09:43 +00:00
|
|
|
pkglib_MODULES = _linux.mod linux.mod normal.mod \
|
2008-02-28 13:04:35 +00:00
|
|
|
_multiboot.mod multiboot.mod aout.mod \
|
2008-09-07 16:09:21 +00:00
|
|
|
play.mod serial.mod ata.mod \
|
2008-08-06 Robert Millan <rmh@aybabtu.com>
* conf/i386-coreboot.rmk (pkglib_MODULES): Add `reboot.mod' and
`halt.mod'.
(reboot_mod_SOURCES, reboot_mod_CFLAGS, reboot_mod_LDFLAGS)
(halt_mod_SOURCES, halt_mod_CFLAGS, halt_mod_LDFLAGS): New variables.
* kern/i386/halt.c: New file.
* kern/i386/reboot.c: Likewise.
* include/grub/i386/reboot.h: Likewise.
* include/grub/i386/halt.h: Likewise.
* commands/halt.c [! GRUB_MACHINE_IEEE1275 ! GRUB_MACHINE_EFI]:
Include `<grub/cpu/halt.h>'.
* commands/reboot.c [! GRUB_MACHINE_IEEE1275 ! GRUB_MACHINE_EFI]
[! GRUB_MACHINE_PCBIOS]: Include `<grub/cpu/reboot.h>'.
* term/i386/pc/at_keyboard.c: Include `<grub/cpu/at_keyboard.h>'.
(SHIFT_L, SHIFT_R, CTRL, ALT, CAPS_LOCK, KEYBOARD_REG_DATA)
(KEYBOARD_REG_STATUS, KEYBOARD_COMMAND_ISREADY, KEYBOARD_COMMAND_READ)
(KEYBOARD_COMMAND_WRITE, KEYBOARD_COMMAND_REBOOT)
(KEYBOARD_SCANCODE_SET1, KEYBOARD_ISMAKE, KEYBOARD_ISREADY)
(KEYBOARD_SCANCODE, OLPC_UP, OLPC_DOWN, OLPC_LEFT, OLPC_RIGHT): Move
from here ...
* include/grub/i386/at_keyboard.h: ... to here.
2008-08-06 00:20:04 +00:00
|
|
|
memdisk.mod pci.mod lspci.mod reboot.mod \
|
2008-11-20 20:34:14 +00:00
|
|
|
halt.mod datetime.mod date.mod datehook.mod \
|
|
|
|
|
lsmmap.mod
|
2007-10-31 22:35:13 +00:00
|
|
|
|
|
|
|
|
# For _linux.mod.
|
2008-08-21 13:18:07 +00:00
|
|
|
_linux_mod_SOURCES = loader/i386/linux.c
|
2007-10-31 22:35:13 +00:00
|
|
|
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
_linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For linux.mod.
|
2008-08-18 13:46:31 +00:00
|
|
|
linux_mod_SOURCES = loader/linux_normal.c
|
2007-10-31 22:35:13 +00:00
|
|
|
linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-01-31 09:15:43 +00:00
|
|
|
#
|
|
|
|
|
# Only arch dependant part of normal.mod will be here. Common part for
|
|
|
|
|
# all architecures of normal.mod is at start and should be kept at sync
|
|
|
|
|
# with other makefiles.
|
|
|
|
|
#
|
|
|
|
|
# Please put arch dependant part of normal.mod at the end of list to
|
|
|
|
|
# keep it simpler to update to different architectures.
|
|
|
|
|
#
|
2007-10-31 22:35:13 +00:00
|
|
|
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
|
|
|
|
|
normal/completion.c normal/execute.c \
|
|
|
|
|
normal/function.c normal/lexer.c normal/main.c normal/menu.c \
|
2009-02-13 20:06:27 +00:00
|
|
|
normal/menu_text.c \
|
2009-01-31 09:15:43 +00:00
|
|
|
normal/color.c \
|
|
|
|
|
normal/menu_viewer.c normal/menu_entry.c \
|
|
|
|
|
normal/misc.c grub_script.tab.c \
|
|
|
|
|
normal/script.c \
|
|
|
|
|
normal/i386/setjmp.S
|
2007-10-31 22:35:13 +00:00
|
|
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
|
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-06 Robert Millan <rmh@aybabtu.com>
* conf/i386-coreboot.rmk (pkglib_MODULES): Add `reboot.mod' and
`halt.mod'.
(reboot_mod_SOURCES, reboot_mod_CFLAGS, reboot_mod_LDFLAGS)
(halt_mod_SOURCES, halt_mod_CFLAGS, halt_mod_LDFLAGS): New variables.
* kern/i386/halt.c: New file.
* kern/i386/reboot.c: Likewise.
* include/grub/i386/reboot.h: Likewise.
* include/grub/i386/halt.h: Likewise.
* commands/halt.c [! GRUB_MACHINE_IEEE1275 ! GRUB_MACHINE_EFI]:
Include `<grub/cpu/halt.h>'.
* commands/reboot.c [! GRUB_MACHINE_IEEE1275 ! GRUB_MACHINE_EFI]
[! GRUB_MACHINE_PCBIOS]: Include `<grub/cpu/reboot.h>'.
* term/i386/pc/at_keyboard.c: Include `<grub/cpu/at_keyboard.h>'.
(SHIFT_L, SHIFT_R, CTRL, ALT, CAPS_LOCK, KEYBOARD_REG_DATA)
(KEYBOARD_REG_STATUS, KEYBOARD_COMMAND_ISREADY, KEYBOARD_COMMAND_READ)
(KEYBOARD_COMMAND_WRITE, KEYBOARD_COMMAND_REBOOT)
(KEYBOARD_SCANCODE_SET1, KEYBOARD_ISMAKE, KEYBOARD_ISREADY)
(KEYBOARD_SCANCODE, OLPC_UP, OLPC_DOWN, OLPC_LEFT, OLPC_RIGHT): Move
from here ...
* include/grub/i386/at_keyboard.h: ... to here.
2008-08-06 00:20:04 +00:00
|
|
|
# For reboot.mod.
|
|
|
|
|
reboot_mod_SOURCES = commands/reboot.c kern/i386/reboot.c
|
|
|
|
|
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For halt.mod.
|
|
|
|
|
halt_mod_SOURCES = commands/halt.c kern/i386/halt.c
|
|
|
|
|
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-10-31 22:35:13 +00:00
|
|
|
# For serial.mod.
|
|
|
|
|
serial_mod_SOURCES = term/i386/pc/serial.c
|
|
|
|
|
serial_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For _multiboot.mod.
|
2009-02-27 21:19:00 +00:00
|
|
|
_multiboot_mod_SOURCES = loader/i386/multiboot.c \
|
2007-10-31 22:35:13 +00:00
|
|
|
loader/i386/pc/multiboot2.c \
|
|
|
|
|
loader/multiboot2.c \
|
|
|
|
|
loader/multiboot_loader.c
|
|
|
|
|
_multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
_multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For multiboot.mod.
|
|
|
|
|
multiboot_mod_SOURCES = loader/multiboot_loader_normal.c
|
|
|
|
|
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-02-28 13:04:35 +00:00
|
|
|
# For aout.mod.
|
|
|
|
|
aout_mod_SOURCES = loader/aout.c
|
|
|
|
|
aout_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-10-31 22:35:13 +00:00
|
|
|
# For play.mod.
|
|
|
|
|
play_mod_SOURCES = commands/i386/pc/play.c
|
|
|
|
|
play_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
play_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-11-05 16:15:27 +00:00
|
|
|
# For ata.mod.
|
|
|
|
|
ata_mod_SOURCES = disk/ata.c
|
|
|
|
|
ata_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-02 12:17:44 +00:00
|
|
|
# For memdisk.mod.
|
|
|
|
|
memdisk_mod_SOURCES = disk/memdisk.c
|
|
|
|
|
memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-03 18:14:07 +00:00
|
|
|
# For pci.mod
|
|
|
|
|
pci_mod_SOURCES = bus/pci.c
|
|
|
|
|
pci_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For lspci.mod
|
|
|
|
|
lspci_mod_SOURCES = commands/lspci.c
|
|
|
|
|
lspci_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-15 15:39:02 +00:00
|
|
|
# For datetime.mod
|
|
|
|
|
datetime_mod_SOURCES = lib/datetime.c lib/i386/datetime.c
|
|
|
|
|
datetime_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For date.mod
|
|
|
|
|
date_mod_SOURCES = commands/date.c
|
|
|
|
|
date_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
date_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For datehook.mod
|
|
|
|
|
datehook_mod_SOURCES = hook/datehook.c
|
|
|
|
|
datehook_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-11-20 20:34:14 +00:00
|
|
|
# For lsmmap.mod
|
|
|
|
|
lsmmap_mod_SOURCES = commands/lsmmap.c
|
|
|
|
|
lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-09-07 16:09:21 +00:00
|
|
|
include $(srcdir)/conf/i386.mk
|
2007-10-31 22:35:13 +00:00
|
|
|
include $(srcdir)/conf/common.mk
|