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

Merge branch 'master' into phcoder/scratch

Browse Source 
Conflicts:
	grub-core/kern/arm/cache_armv6.S
	grub-core/kern/uboot/init.c
	include/grub/arm/system.h
This commit is contained in:
Vladimir Serbinenko committed 2013-12-24 00:33:47 +01:00
2 parents 850da8e056 72f099578e
commit 2cbee7340c
22 files changed
+190 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/grub/arm/system.h
+1 -1
View File
@@ -9,7 +9,7 @@ enum
GRUB_ARM_MACHINE_TYPE_FDT = 0xFFFFFFFF
};
void grub_arm_disable_caches_mmu (void);
void EXPORT_FUNC(grub_arm_disable_caches_mmu) (void);
void grub_arm_enable_caches_mmu (void);
void grub_arm_enable_mmu (grub_uint32_t *mmu_tables);
void grub_arm_clear_mmu_v6 (void);
include/grub/arm64/linux.h
+2 -15
View File
@@ -21,13 +21,10 @@
#include <grub/efi/efi.h>
#define GRUB_EFI_KERNEL_STUB_ENTRY_OFFSET 0
#define GRUB_LINUX_MAX_LOAD_ADDR 0xffffffffffffULL
#define GRUB_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */
/* From linux/Documentation/arm64/booting.txt */
struct linux_kernel_header
struct grub_arm64_linux_kernel_header
{
grub_uint32_t code0; /* Executable code */
grub_uint32_t code1; /* Executable code */
@@ -41,14 +38,4 @@ struct linux_kernel_header
grub_uint32_t hdr_offset; /* Offset of PE/COFF header */
};
#define grub_linux_get_params() NULL
extern grub_err_t grub_linux_init_params (void);
extern grub_err_t grub_linux_finalize_params (void);
extern grub_err_t grub_linux_register_kernel (struct linux_kernel_header *lh);
extern grub_err_t grub_linux_register_cmdline (void * addr);
extern grub_err_t grub_linux_register_initrd (void * addr, grub_size_t size);
extern void grub_efi_linux_arch_register_commands (void);
extern void grub_efi_linux_arch_unregister_commands (void);
#endif /* ! GRUB_LINUX_CPU_HEADER */