diff options
| author | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-17 14:19:40 -0400 |
|---|---|---|
| committer | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-17 14:19:40 -0400 |
| commit | 7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6 (patch) | |
| tree | e99684b87952bded5e51c83848a5d35ab53d9ab0 /config | |
| parent | starting on ata (diff) | |
| parent | clang 18 in flake instead of zig (diff) | |
| download | comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.tar.gz comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.tar.bz2 comus-7108e7c951f7cff79ce4992f1c7d8d0af0bb5af6.zip | |
Merge branch 'main' into ata
Diffstat (limited to 'config')
| -rw-r--r-- | config/grub.cfg | 2 | ||||
| -rw-r--r-- | config/kernel.ld | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/grub.cfg b/config/grub.cfg index 6cedb28..0157d85 100644 --- a/config/grub.cfg +++ b/config/grub.cfg @@ -4,6 +4,6 @@ terminal_input at_keyboard termianl_output console menuentry "kern" { - multiboot2 /boot/kernel + multiboot2 /boot/kernel.bin boot } diff --git a/config/kernel.ld b/config/kernel.ld index 0806257..52e9088 100644 --- a/config/kernel.ld +++ b/config/kernel.ld @@ -33,4 +33,8 @@ SECTIONS } kernel_end = .; + + /DISCARD/ : { + *(.eh_frame .note.GNU-stack .note.gnu.property .comment) + } } |