From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 8 May 2017 20:16:47 +0000 (+0200)
Subject: Fix spurious diffs with master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af937d1337b9d535d89816d8589c864e16ef220;p=thirdparty%2Fgrub.git

Fix spurious diffs with master
---

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index f7b0b51c6..3e1f0cf09 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -847,7 +847,7 @@ module = {
   common = commands/gptsync.c;
 };
 
-/*module = {
+module = {
   name = halt;
   nopc = commands/halt.c;
   i386_pc = commands/i386/pc/halt.c;
@@ -884,7 +884,7 @@ module = {
   uboot = lib/uboot/reboot.c;
   arm_coreboot = lib/dummy/reboot.c;
   common = commands/reboot.c;
-};*/
+};
 
 module = {
   name = hashsum;
diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S
index 6ba15708b..5ae76a3d8 100644
--- a/grub-core/kern/arm/cache_armv7.S
+++ b/grub-core/kern/arm/cache_armv7.S
@@ -135,4 +135,4 @@ clean_invalidate_dcache:
 	pop	{r4-r12, lr}
 	bx	lr
 
-#include "cache.S"
+#include "cache.S"
\ No newline at end of file
diff --git a/include/grub/uboot/uboot.h b/include/grub/uboot/uboot.h
index 5ca1a7f63..c122de6ab 100644
--- a/include/grub/uboot/uboot.h
+++ b/include/grub/uboot/uboot.h
@@ -37,7 +37,7 @@ grub_err_t grub_uboot_probe_hardware (void);
 extern grub_addr_t EXPORT_VAR (start_of_ram);
 
 grub_uint32_t EXPORT_FUNC (grub_uboot_get_machine_type) (void);
-const void *EXPORT_FUNC (grub_uboot_get_boot_data) (void);
+grub_addr_t EXPORT_FUNC (grub_uboot_get_boot_data) (void);
 
 
 /*