From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001

From: Vladimir Serbinenko <phcoder@gmail.com>

Date: Mon, 8 May 2017 21:59:48 +0200

Subject: [PATCH] arm_coreboot: Support grub-mkstandalone.

---

 util/grub-install-common.c  | 12 ++++++++++--

 util/grub-install.c         |  7 +++++++

 include/grub/util/install.h |  6 +++++-

 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/util/grub-install-common.c b/util/grub-install-common.c

index 8539ff3484d..9e3e358c96a 100644

--- a/util/grub-install-common.c

+++ b/util/grub-install-common.c

@@ -73,6 +73,7 @@ grub_install_help_filter (int key, const char *text,

 static int (*compress_func) (const char *src, const char *dest) = NULL;

 char *grub_install_copy_buffer;

+static char *dtb;

 int

 grub_install_copy_file (const char *src,

@@ -364,6 +365,11 @@ grub_install_parse (int key, char *arg)

     case GRUB_INSTALL_OPTIONS_INSTALL_FONTS:

       handle_install_list (&install_fonts, arg, 0);

       return 1;

+    case GRUB_INSTALL_OPTIONS_DTB:

+      if (dtb)

+	free (dtb);

+      dtb = xstrdup (arg);

+      return 1;

     case GRUB_INSTALL_OPTIONS_INSTALL_COMPRESS:

       if (strcmp (arg, "no") == 0

 	  || strcmp (arg, "none") == 0)

@@ -486,9 +492,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,

   grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'"

 		  " --output '%s' "

+		  " --dtb '%s' "

 		  "--format '%s' --compression '%s' %s %s\n",

 		  dir, prefix,

-		  outname, mkimage_target,

+		  outname, dtb ? : "", mkimage_target,

 		  compnames[compression], note ? "--note" : "", s);

   free (s);

@@ -499,7 +506,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,

   grub_install_generate_image (dir, prefix, fp, outname,

 			       modules.entries, memdisk_path,

 			       pubkeys, npubkeys, config_path, tgt,

-			       note, compression, 0);

+			       note, compression, dtb);

   while (dc--)

     grub_install_pop_module ();

 }

@@ -666,6 +673,7 @@ static struct

     [GRUB_INSTALL_PLATFORM_ARM_EFI] =          { "arm",     "efi"       },

     [GRUB_INSTALL_PLATFORM_ARM64_EFI] =        { "arm64",   "efi"       },

     [GRUB_INSTALL_PLATFORM_ARM_UBOOT] =        { "arm",     "uboot"     },

+    [GRUB_INSTALL_PLATFORM_ARM_COREBOOT] =     { "arm",     "coreboot"  },

   }; 

 char *

diff --git a/util/grub-install.c b/util/grub-install.c

index 9074d3e9e52..75e3e5ba6f0 100644

--- a/util/grub-install.c

+++ b/util/grub-install.c

@@ -486,6 +486,7 @@ have_bootdev (enum grub_install_plat pl)

     case GRUB_INSTALL_PLATFORM_I386_QEMU:

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:

@@ -911,6 +912,7 @@ main (int argc, char *argv[])

     case GRUB_INSTALL_PLATFORM_I386_QEMU:

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:

     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

@@ -946,6 +948,7 @@ main (int argc, char *argv[])

     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:

     case GRUB_INSTALL_PLATFORM_I386_QEMU:

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:

     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

@@ -1448,6 +1451,7 @@ main (int argc, char *argv[])

 		  case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:

 		  case GRUB_INSTALL_PLATFORM_I386_QEMU:

 		  case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+		  case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

 		  case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

 		  case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

 		  case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:

@@ -1542,6 +1546,7 @@ main (int argc, char *argv[])

       break;

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_I386_IEEE1275:

     case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:

@@ -1629,6 +1634,7 @@ main (int argc, char *argv[])

     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_I386_PC:

     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:

@@ -1889,6 +1895,7 @@ main (int argc, char *argv[])

     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:

     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:

     case GRUB_INSTALL_PLATFORM_I386_COREBOOT:

+    case GRUB_INSTALL_PLATFORM_ARM_COREBOOT:

     case GRUB_INSTALL_PLATFORM_I386_MULTIBOOT:

     case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:

     case GRUB_INSTALL_PLATFORM_ARM_UBOOT:

diff --git a/include/grub/util/install.h b/include/grub/util/install.h

index 6abd288c313..5910b0c09bc 100644

--- a/include/grub/util/install.h

+++ b/include/grub/util/install.h

@@ -29,6 +29,8 @@

 #define GRUB_INSTALL_OPTIONS					  \

   { "modules",      GRUB_INSTALL_OPTIONS_MODULES, N_("MODULES"),	  \

     0, N_("pre-load specified modules MODULES"), 1 },			  \

+  { "dtb",      GRUB_INSTALL_OPTIONS_DTB, N_("FILE"),	  \

+    0, N_("embed a specific DTB"), 1 },			  \

   { "install-modules", GRUB_INSTALL_OPTIONS_INSTALL_MODULES,	  \

     N_("MODULES"), 0,							  \

     N_("install only MODULES and their dependencies [default=all]"), 1 }, \

@@ -99,6 +101,7 @@ enum grub_install_plat

     GRUB_INSTALL_PLATFORM_I386_XEN,

     GRUB_INSTALL_PLATFORM_X86_64_XEN,

     GRUB_INSTALL_PLATFORM_ARM64_EFI,

+    GRUB_INSTALL_PLATFORM_ARM_COREBOOT,

     GRUB_INSTALL_PLATFORM_MAX

   };

@@ -115,7 +118,8 @@ enum grub_install_options {

   GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY,

   GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY,

   GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE,

-  GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS

+  GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,

+  GRUB_INSTALL_OPTIONS_DTB

 };

 extern char *grub_install_source_directory;