3 files changed, 20 insertions, 0 deletions
diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig
index c9f07d537c..656f7c9e23 100644
--- a/payloads/external/GRUB2/Kconfig
+++ b/payloads/external/GRUB2/Kconfig
@@ -9,8 +9,24 @@ config GRUB2_MASTER
 	help
 	  Newest GRUB2 version
 
+config GRUB2_REVISION
+	bool "git revision"
+	help
+	  Select this option if you have a specific commit or branch
+	  that you want to use as the revision from which to
+	  build GRUB2.
+
+	  You will be able to specify the name of a branch or a commit id
+	  later.
 endchoice
 
+config GRUB2_REVISION_ID
+	string "Insert a commit's SHA-1 or a branch name"
+	depends on GRUB2_REVISION
+	default "origin/master"
+	help
+	   The commit's SHA-1 or branch name of the revision to use.
+
 config GRUB2_EXTRA_MODULES
 	string "Extra modules to include in GRUB image"
 	help
diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile
index 137fec2847..7cac6a3219 100644
--- a/payloads/external/GRUB2/Makefile
+++ b/payloads/external/GRUB2/Makefile
@@ -1,5 +1,7 @@
 TAG-$(CONFIG_GRUB2_MASTER)=
+TAG-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID)
 NAME-$(CONFIG_GRUB2_MASTER)=HEAD
+NAME-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID)
 
 project_git_repo=git://git.sv.gnu.org/grub.git
 project_dir=grub2
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 1c0d38ccbf..921c840c3e 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -134,6 +134,8 @@ grub2:
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
 			OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
 			CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \
+			CONFIG_GRUB2_REVISION=$(CONFIG_GRUB2_REVISION) \
+			CONFIG_GRUB2_REVISION_ID=$(CONFIG_GRUB2_REVISION_ID) \
 			CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES)
 
 payloads/external/GRUB2/grub2/build/default_payload.elf: grub2