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

This reverts commit 082fd84d525f8d6602f892160b77c0a948308a78.

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>

diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
index a7dafd85a9059a126a2f344d4a7724f2a46aba33..4b5502aeb73e2b763fcc097ee144e6959bf33430 100644 (file)
--- a/grub-core/osdep/basic/platform.c
+++ b/grub-core/osdep/basic/platform.c
@@ -18,12 +18,6 @@
 
 #include <grub/util/install.h>
 
-const char *
-grub_install_get_default_arm_platform (void)
-{
-  return "arm-uboot";
-}
-
 const char *
 grub_install_get_default_x86_platform (void)
 { 

diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
index 6dee798e3fed9dde70196735e4ffc1e7687d176f..775b6c03128b971af59318666bbdcfe6c56b5f49 100644 (file)
--- a/grub-core/osdep/linux/platform.c
+++ b/grub-core/osdep/linux/platform.c
@@ -97,28 +97,6 @@ read_platform_size (void)
   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 *
 grub_install_get_default_x86_platform (void)
 { 

diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index 2631b1074513c25a22ff22c21e0d752e24b74279..b1a00154feb399e5a02da6dd7cb2d42e02e49ac7 100644 (file)
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -210,9 +210,6 @@ grub_util_get_target_dirname (const struct grub_install_image_target_desc *t);
 void
 grub_install_create_envblk_file (const char *name);
 
-const char *
-grub_install_get_default_arm_platform (void);
-
 const char *
 grub_install_get_default_x86_platform (void);
 

diff --git a/util/grub-install.c b/util/grub-install.c
index 264f9ecdc59f14de1926ce42ec669d41aa5afd6c..c6c3da3316eba46f66cbae42c7958e1f6e6ded75 100644 (file)
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -319,7 +319,7 @@ get_default_platform (void)
 #elif defined (__ia64__)
    return "ia64-efi";
 #elif defined (__arm__)
-   return grub_install_get_default_arm_platform ();
+   return "arm-uboot";
 #elif defined (__aarch64__)
    return "arm64-efi";
 #elif defined (__amd64__) || defined (__x86_64__) || defined (__i386__)