Skip to content

Introduce ".loader" section manifesting the default next boot target #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vittyvk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Introduce ".loader" section manifesting the default next boot target #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ OBJS = shim.o \
utils.o \
verify.o \
version.o \
default_loader.o \

KEYS = shim_cert.h \
ocsp.* \
Expand Down Expand Up @@ -432,7 +433,7 @@ endif
$(OBJCOPY) -D -j .text -j .sdata -j .data -j .data.ident \
-j .dynamic -j .rodata -j .rel* \
-j .rela* -j .dyn -j .reloc -j .eh_frame \
-j .vendor_cert -j .sbat -j .sbatlevel \
-j .vendor_cert -j .sbat -j .sbatlevel -j .loader \
--file-alignment 0x1000 \
--section-alignment $(ARCH_SECTION_ALIGNMENT) \
$(FORMAT) $< $@
Expand All @@ -450,7 +451,7 @@ endif
$(OBJCOPY) -D -j .text -j .sdata -j .data \
-j .dynamic -j .rodata -j .rel* \
-j .rela* -j .dyn -j .reloc -j .eh_frame -j .sbat \
-j .sbatlevel \
-j .sbatlevel -j .loader \
-j .debug_info -j .debug_abbrev -j .debug_aranges \
-j .debug_line -j .debug_str -j .debug_ranges \
-j .note.gnu.build-id \
Expand Down
12 changes: 12 additions & 0 deletions default_loader.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: BSD-2-Clause-Patent

.section .loader, "a", %progbits
.balign 1, 0
.globl default_loader
.type default_loader, %object
.size default_loader, .Ldefault_loader_end - default_loader
default_loader:
.ascii DEFAULT_LOADER_CHAR
.byte 0
.Ldefault_loader_end:
.section .note.GNU-stack,"a"
5 changes: 5 additions & 0 deletions elf_aarch64_efi.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ SECTIONS
*(.sbatlevel)
}

. = ALIGN(65536);
.loader : {
*(.loader)
}

. = ALIGN(65536);
.data :
{
Expand Down
1 change: 1 addition & 0 deletions elf_arm_efi.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ SECTIONS
. = ALIGN(4096);
*(.vendor_cert)
*(.data.ident)
*(.loader)
. = ALIGN(4096);
}
. = ALIGN(4096);
Expand Down
5 changes: 5 additions & 0 deletions elf_ia32_efi.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ SECTIONS
*(.sbatlevel)
}

. = ALIGN(4096);
.loader : {
*(.loader)
}

. = ALIGN(4096);
.data :
{
Expand Down
5 changes: 5 additions & 0 deletions elf_ia64_efi.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ SECTIONS
*(.sbatlevel)
}

. = ALIGN(4096);
.loader : {
*(.loader)
}

. = ALIGN(4096);
.data :
{
Expand Down
5 changes: 5 additions & 0 deletions elf_x86_64_efi.lds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ SECTIONS
*(.sbatlevel)
}

. = ALIGN(4096);
.loader : {
*(.loader)
}

. = ALIGN(4096);
.data :
{
Expand Down
Loading