]> git.ipfire.org Git - thirdparty/grub.git/commit
i386: Don't include lib/i386/reset.c in EFI builds
authorLeif Lindholm <leif.lindholm@linaro.org>
Mon, 9 Jul 2018 18:49:06 +0000 (19:49 +0100)
committerDaniel Kiper <daniel.kiper@oracle.com>
Wed, 25 Jul 2018 12:18:11 +0000 (14:18 +0200)
commitc79ebcd18cf3e208e9dda5e2ae008f76c92fe451
tree7f6372e1c3948511b723826fa3c7394a7c86c43c
parenta2f26adfef2fc8a7d7392c3704031df4624c67b0
i386: Don't include lib/i386/reset.c in EFI builds

Commit 0ba90a7f0178 ("efi: Move grub_reboot() into kernel") broke
the build on i386-efi - genmoddep.awk bails out with message
  grub_reboot in reboot is duplicated in kernel
This is because both lib/i386/reset.c and kern/efi/efi.c now provide
this function.

Rather than explicitly list each i386 platform variant in
Makefile.core.def, include the contents of lib/i386/reset.c only when
GRUB_MACHINE_EFI is not set.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/lib/i386/reboot.c