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

enable emuusb and emupci on emu platform only

Browse source 
Also explicitly disable them in configure unless built for emu platform.

Signed-off-by: Andrey Borzenkov <arvidjaar@gmail.com>
This commit is contained in:
Andrey Borzenkov 2013-11-04 16:53:39 +04:00
parent 67508925d0
commit e7d09ac4f7
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-04 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Explicitly disable emusdl, emuusb and emupci on non-
emu platforms.
* grub-core/Makefile.core.def: Enable emupci and emuucb only for emu.
2013-11-04 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-04 Vladimir Serbinenko <phcoder@gmail.com>
* docs/grub.texi: Document usage of menuentry id. * docs/grub.texi: Document usage of menuentry id.

7
configure.ac
View file

@ -1026,6 +1026,13 @@ fi
AC_SUBST([enable_grub_emu_sdl]) AC_SUBST([enable_grub_emu_sdl])
AC_SUBST([enable_grub_emu_usb]) AC_SUBST([enable_grub_emu_usb])
AC_SUBST([enable_grub_emu_pci]) AC_SUBST([enable_grub_emu_pci])
else
# Ignore --enable-emu-* if platform is not emu
enable_grub_emu_sdl=no
enable_grub_emu_usb=no
enable_grub_emu_pci=no
fi fi
AC_ARG_ENABLE([grub-mkfont], AC_ARG_ENABLE([grub-mkfont],

2
grub-core/Makefile.core.def
View file

@ -497,6 +497,7 @@ module = {
module = { module = {
name = emuusb; name = emuusb;
common = bus/usb/usb.c; common = bus/usb/usb.c;
enable = emu;
condition = COND_GRUB_EMU_USB; condition = COND_GRUB_EMU_USB;
}; };
@ -566,6 +567,7 @@ module = {
common = bus/emu/pci.c; common = bus/emu/pci.c;
common = commands/lspci.c; common = commands/lspci.c;
enable = emu;
condition = COND_GRUB_EMU_PCI; condition = COND_GRUB_EMU_PCI;
}; };