-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'devel-stable' into for-linus
- Loading branch information
Showing
29 changed files
with
986 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * Copyright (C) 2013-2015 Linaro Ltd | ||
| * Authors: Roy Franz <roy.franz@linaro.org> | ||
| * Ard Biesheuvel <ard.biesheuvel@linaro.org> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| .macro __nop | ||
| #ifdef CONFIG_EFI_STUB | ||
| @ This is almost but not quite a NOP, since it does clobber the | ||
| @ condition flags. But it is the best we can do for EFI, since | ||
| @ PE/COFF expects the magic string "MZ" at offset 0, while the | ||
| @ ARM/Linux boot protocol expects an executable instruction | ||
| @ there. | ||
| .inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000 | ||
| #else | ||
| mov r0, r0 | ||
| #endif | ||
| .endm | ||
|
|
||
| .macro __EFI_HEADER | ||
| #ifdef CONFIG_EFI_STUB | ||
| b __efi_start | ||
|
|
||
| .set start_offset, __efi_start - start | ||
| .org start + 0x3c | ||
| @ | ||
| @ The PE header can be anywhere in the file, but for | ||
| @ simplicity we keep it together with the MSDOS header | ||
| @ The offset to the PE/COFF header needs to be at offset | ||
| @ 0x3C in the MSDOS header. | ||
| @ The only 2 fields of the MSDOS header that are used are this | ||
| @ PE/COFF offset, and the "MZ" bytes at offset 0x0. | ||
| @ | ||
| .long pe_header - start @ Offset to the PE header. | ||
|
|
||
| pe_header: | ||
| .ascii "PE\0\0" | ||
|
|
||
| coff_header: | ||
| .short 0x01c2 @ ARM or Thumb | ||
| .short 2 @ nr_sections | ||
| .long 0 @ TimeDateStamp | ||
| .long 0 @ PointerToSymbolTable | ||
| .long 1 @ NumberOfSymbols | ||
| .short section_table - optional_header | ||
| @ SizeOfOptionalHeader | ||
| .short 0x306 @ Characteristics. | ||
| @ IMAGE_FILE_32BIT_MACHINE | | ||
| @ IMAGE_FILE_DEBUG_STRIPPED | | ||
| @ IMAGE_FILE_EXECUTABLE_IMAGE | | ||
| @ IMAGE_FILE_LINE_NUMS_STRIPPED | ||
|
|
||
| optional_header: | ||
| .short 0x10b @ PE32 format | ||
| .byte 0x02 @ MajorLinkerVersion | ||
| .byte 0x14 @ MinorLinkerVersion | ||
| .long _end - __efi_start @ SizeOfCode | ||
| .long 0 @ SizeOfInitializedData | ||
| .long 0 @ SizeOfUninitializedData | ||
| .long efi_stub_entry - start @ AddressOfEntryPoint | ||
| .long start_offset @ BaseOfCode | ||
| .long 0 @ data | ||
|
|
||
| extra_header_fields: | ||
| .long 0 @ ImageBase | ||
| .long 0x200 @ SectionAlignment | ||
| .long 0x200 @ FileAlignment | ||
| .short 0 @ MajorOperatingSystemVersion | ||
| .short 0 @ MinorOperatingSystemVersion | ||
| .short 0 @ MajorImageVersion | ||
| .short 0 @ MinorImageVersion | ||
| .short 0 @ MajorSubsystemVersion | ||
| .short 0 @ MinorSubsystemVersion | ||
| .long 0 @ Win32VersionValue | ||
|
|
||
| .long _end - start @ SizeOfImage | ||
| .long start_offset @ SizeOfHeaders | ||
| .long 0 @ CheckSum | ||
| .short 0xa @ Subsystem (EFI application) | ||
| .short 0 @ DllCharacteristics | ||
| .long 0 @ SizeOfStackReserve | ||
| .long 0 @ SizeOfStackCommit | ||
| .long 0 @ SizeOfHeapReserve | ||
| .long 0 @ SizeOfHeapCommit | ||
| .long 0 @ LoaderFlags | ||
| .long 0x6 @ NumberOfRvaAndSizes | ||
|
|
||
| .quad 0 @ ExportTable | ||
| .quad 0 @ ImportTable | ||
| .quad 0 @ ResourceTable | ||
| .quad 0 @ ExceptionTable | ||
| .quad 0 @ CertificationTable | ||
| .quad 0 @ BaseRelocationTable | ||
|
|
||
| section_table: | ||
| @ | ||
| @ The EFI application loader requires a relocation section | ||
| @ because EFI applications must be relocatable. This is a | ||
| @ dummy section as far as we are concerned. | ||
| @ | ||
| .ascii ".reloc\0\0" | ||
| .long 0 @ VirtualSize | ||
| .long 0 @ VirtualAddress | ||
| .long 0 @ SizeOfRawData | ||
| .long 0 @ PointerToRawData | ||
| .long 0 @ PointerToRelocations | ||
| .long 0 @ PointerToLineNumbers | ||
| .short 0 @ NumberOfRelocations | ||
| .short 0 @ NumberOfLineNumbers | ||
| .long 0x42100040 @ Characteristics | ||
|
|
||
| .ascii ".text\0\0\0" | ||
| .long _end - __efi_start @ VirtualSize | ||
| .long __efi_start @ VirtualAddress | ||
| .long _edata - __efi_start @ SizeOfRawData | ||
| .long __efi_start @ PointerToRawData | ||
| .long 0 @ PointerToRelocations | ||
| .long 0 @ PointerToLineNumbers | ||
| .short 0 @ NumberOfRelocations | ||
| .short 0 @ NumberOfLineNumbers | ||
| .long 0xe0500020 @ Characteristics | ||
|
|
||
| .align 9 | ||
| __efi_start: | ||
| #endif | ||
| .endm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #ifndef __ASM_ARM_EFI_H | ||
| #define __ASM_ARM_EFI_H | ||
|
|
||
| #include <asm/cacheflush.h> | ||
| #include <asm/cachetype.h> | ||
| #include <asm/early_ioremap.h> | ||
| #include <asm/fixmap.h> | ||
| #include <asm/highmem.h> | ||
| #include <asm/mach/map.h> | ||
| #include <asm/mmu_context.h> | ||
| #include <asm/pgtable.h> | ||
|
|
||
| #ifdef CONFIG_EFI | ||
| void efi_init(void); | ||
|
|
||
| int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); | ||
|
|
||
| #define efi_call_virt(f, ...) \ | ||
| ({ \ | ||
| efi_##f##_t *__f; \ | ||
| efi_status_t __s; \ | ||
| \ | ||
| efi_virtmap_load(); \ | ||
| __f = efi.systab->runtime->f; \ | ||
| __s = __f(__VA_ARGS__); \ | ||
| efi_virtmap_unload(); \ | ||
| __s; \ | ||
| }) | ||
|
|
||
| #define __efi_call_virt(f, ...) \ | ||
| ({ \ | ||
| efi_##f##_t *__f; \ | ||
| \ | ||
| efi_virtmap_load(); \ | ||
| __f = efi.systab->runtime->f; \ | ||
| __f(__VA_ARGS__); \ | ||
| efi_virtmap_unload(); \ | ||
| }) | ||
|
|
||
| static inline void efi_set_pgd(struct mm_struct *mm) | ||
| { | ||
| check_and_switch_context(mm, NULL); | ||
| } | ||
|
|
||
| void efi_virtmap_load(void); | ||
| void efi_virtmap_unload(void); | ||
|
|
||
| #else | ||
| #define efi_init() | ||
| #endif /* CONFIG_EFI */ | ||
|
|
||
| /* arch specific definitions used by the stub code */ | ||
|
|
||
| #define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__) | ||
|
|
||
| /* | ||
| * A reasonable upper bound for the uncompressed kernel size is 32 MBytes, | ||
| * so we will reserve that amount of memory. We have no easy way to tell what | ||
| * the actuall size of code + data the uncompressed kernel will use. | ||
| * If this is insufficient, the decompressor will relocate itself out of the | ||
| * way before performing the decompression. | ||
| */ | ||
| #define MAX_UNCOMP_KERNEL_SIZE SZ_32M | ||
|
|
||
| /* | ||
| * The kernel zImage should preferably be located between 32 MB and 128 MB | ||
| * from the base of DRAM. The min address leaves space for a maximal size | ||
| * uncompressed image, and the max address is due to how the zImage decompressor | ||
| * picks a destination address. | ||
| */ | ||
| #define ZIMAGE_OFFSET_LIMIT SZ_128M | ||
| #define MIN_ZIMAGE_OFFSET MAX_UNCOMP_KERNEL_SIZE | ||
| #define MAX_FDT_OFFSET ZIMAGE_OFFSET_LIMIT | ||
|
|
||
| #endif /* _ASM_ARM_EFI_H */ |
Oops, something went wrong.