Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-23 15:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into arm_coreboot

Browse Source
This commit is contained in:
Vladimir Serbinenko committed 2017-05-08 17:51:27 +02:00
2 parents 3e6d59d7cb d08c968514
commit b0300c6048
4 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/kern/arm/startup.S
+1 -1
View File
@@ -167,7 +167,7 @@ VARIABLE(grub_arm_saved_registers)
.long 0 @ r4
.long 0 @ r5
.long 0 @ r6
.long 0 @ r7
.long 0 @ r7
.long 0 @ r8
.long 0 @ r9
.long 0 @ r10
grub-core/kern/arm/uboot/init.c
+2 -2
View File
@@ -29,10 +29,10 @@ grub_uboot_get_machine_type (void)
return grub_arm_saved_registers.r[1];
}
const void *
grub_addr_t
grub_uboot_get_boot_data (void)
{
return (const void *) grub_arm_saved_registers.r[2];
return grub_arm_saved_registers.r[2];
}
int