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
3 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/Makefile.core.def
+3
View File
@@ -154,6 +154,7 @@ kernel = {
uboot = term/uboot/console.c;
arm_uboot = kern/arm/uboot/init.c;
arm_uboot = kern/arm/uboot/uboot.S;
<<<<<<< HEAD
arm_coreboot = kern/arm/coreboot/init.c;
arm_coreboot = kern/arm/coreboot/timer.c;
@@ -166,6 +167,8 @@ kernel = {
arm_coreboot = term/arm/cros_ec.c;
arm_coreboot = commands/keylayouts.c;
arm_coreboot = kern/arm/coreboot/dma.c;
=======
>>>>>>> master
terminfoinkernel = term/terminfo.c;
terminfoinkernel = term/tparm.c;
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
util/grub-mkimagexx.c
+2 -1
View File
@@ -267,7 +267,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
ehdr->e_entry = grub_host_to_target32 (target_addr);
phdr->p_vaddr = grub_host_to_target32 (target_addr);
phdr->p_paddr = grub_host_to_target32 (target_addr);
phdr->p_align = grub_host_to_target32 (layout->align > image_target->link_align ? layout->align : image_target->link_align);
phdr->p_align = grub_host_to_target32 (layout->align > image_target->link_align ?
layout->align : image_target->link_align);
if (image_target->id == IMAGE_LOONGSON_ELF)
ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER
| EF_MIPS_PIC | EF_MIPS_CPIC);