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

Revert "grub-install: Check for arm-efi as a default target"

Browse source 
This reverts commit 082fd84d52.

Incorrect version of the patch was pushed into the git repo.

Reported-by: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Kiper 2019-02-26 15:07:28 +01:00 committed by Vincent Batts
parent 18f824dd18
commit efdfac9e2f
4 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub-core/osdep/basic/platform.c
View file

@ -18,12 +18,6 @@
#include <grub/util/install.h> #include <grub/util/install.h>
const char *
grub_install_get_default_arm_platform (void)
{
return "arm-uboot";
}
const char * const char *
grub_install_get_default_x86_platform (void) grub_install_get_default_x86_platform (void)
{ {

22
grub-core/osdep/linux/platform.c
View file

@ -97,28 +97,6 @@ read_platform_size (void)
return ret; return ret;
} }
const char *
grub_install_get_default_arm_platform (void)
{
/*
* On Linux, we need the efivars kernel modules. If no EFI is available this
* module just does nothing besides a small hello and if we detect efi we'll
* load it anyway later. So it should be safe to try to load it here.
*/
grub_util_exec_redirect_all ((const char * []){ "modprobe", "efivars", NULL },
NULL, NULL, "/dev/null");
grub_util_info ("Looking for /sys/firmware/efi ..");
if (is_not_empty_directory ("/sys/firmware/efi"))
{
grub_util_info ("...found");
return "arm-efi";
}
grub_util_info ("... not found");
return "arm-uboot";
}
const char * const char *
grub_install_get_default_x86_platform (void) grub_install_get_default_x86_platform (void)
{ {

3
include/grub/util/install.h
View file

@ -210,9 +210,6 @@ grub_util_get_target_dirname (const struct grub_install_image_target_desc *t);
void void
grub_install_create_envblk_file (const char *name); grub_install_create_envblk_file (const char *name);
const char *
grub_install_get_default_arm_platform (void);
const char * const char *
grub_install_get_default_x86_platform (void); grub_install_get_default_x86_platform (void);

2
util/grub-install.c
View file

@ -319,7 +319,7 @@ get_default_platform (void)
#elif defined (__ia64__) #elif defined (__ia64__)
return "ia64-efi"; return "ia64-efi";
#elif defined (__arm__) #elif defined (__arm__)
return grub_install_get_default_arm_platform (); return "arm-uboot";
#elif defined (__aarch64__) #elif defined (__aarch64__)
return "arm64-efi"; return "arm64-efi";
#elif defined (__amd64__) || defined (__x86_64__) || defined (__i386__) #elif defined (__amd64__) || defined (__x86_64__) || defined (__i386__)