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

i386: Don't include lib/i386/reset.c in EFI builds

Browse source 
Commit 0ba90a7f01 ("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>
This commit is contained in:
Leif Lindholm 2018-07-09 19:49:06 +01:00 committed by Daniel Kiper
parent a2f26adfef
commit c79ebcd18c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/lib/i386/reboot.c
View file

@ -16,6 +16,8 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef GRUB_MACHINE_EFI
#include <grub/relocator.h> #include <grub/relocator.h>
#include <grub/cpu/relocator.h> #include <grub/cpu/relocator.h>
#include <grub/misc.h> #include <grub/misc.h>
@ -58,3 +60,5 @@ grub_reboot (void)
while (1); while (1);
} }
#endif /* GRUB_MACHINE_EFI */