From 1c0b7f92f941c924689a6a5c1a72de49e625f273 Mon Sep 17 00:00:00 2001 From: Alessandro Mauri Date: Fri, 9 Jun 2023 02:40:42 +0200 Subject: [PATCH] bruhhh --- kernel/-kernel | 0 kernel/.gitignore | 1 + kernel/Makefile | 12 ++++++++---- kernel/kernel | Bin 10944 -> 0 bytes qemu_run.sh | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 kernel/-kernel delete mode 100755 kernel/kernel diff --git a/kernel/-kernel b/kernel/-kernel deleted file mode 100644 index e69de29..0000000 diff --git a/kernel/.gitignore b/kernel/.gitignore index e134a4e..b3c4a6b 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -1,4 +1,5 @@ **/*.o *.img *.elf +*.sym compile_commands.json \ No newline at end of file diff --git a/kernel/Makefile b/kernel/Makefile index ad66788..459234f 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,6 +1,7 @@ CC = $(TARGET)-gcc LD = $(TARGET)-ld AS = $(TARGET)-gcc +OBJCOPY = $(TARGET)-objcopy KERN_WARNINGS = -Wall -Wextra -Wpedantic -Wuninitialized -Wunused-result KERN_FLAGS = -ffreestanding -nostartfiles -nostdlib -nodefaultlibs --std=gnu2x @@ -8,7 +9,7 @@ MACHINE_FLAGS = -march=rv64gc -mabi=lp64 -mcmodel=medany PATH_FLAGS = -I./ CFLAGS = ${MACHINE_FLAGS} -g -O0 ${KERN_WARNINGS} ${KERN_FLAGS} ${PATH_FLAGS} -LDFLAGS = -m elf64lriscv --gc-sections -T rv64-sifive_u.ld +LDFLAGS = -m elf64lriscv --gc-sections -nostdlib -T rv64-sifive_u.ld ASFLAGS = ${CFLAGS} .SUFFIXES: .c .o .S @@ -19,9 +20,15 @@ ASFLAGS = ${CFLAGS} .S.o: ${AS} ${ASFLAGS} -o $@ -c $< +.PHONY: all test clean +all: kernel.elf kernel.sym + kernel.elf: kernel.o crt0.o platform/FU740/uart.o platform/FU740/clock.o ${LD} ${LDFLAGS} -o kernel.elf kernel.o crt0.o platform/FU740/uart.o platform/FU740/clock.o +kernel.sym: kernel.elf + ${OBJCOPY} --only-keep-debug kernel.elf kernel.sym + kernel.o: kernel.c platform/FU740/uart.o: platform/FU740/uart.c @@ -30,9 +37,6 @@ platform/FU740/clock.o: platform/FU740/clock.c crt0.o: crt0.S -.PHONY: all test clean -all: kernel.img - test: clean: diff --git a/kernel/kernel b/kernel/kernel deleted file mode 100755 index 189f928767852a751e0bab2e32c68a8092253df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10944 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 diff --git a/qemu_run.sh b/qemu_run.sh index 163bc94..79d8b11 100755 --- a/qemu_run.sh +++ b/qemu_run.sh @@ -15,7 +15,7 @@ kern_img='' while [ "${1:-}" != "" ]; do case "$1" in "--debug") - EMU_EXTRA='-D' + EMU_EXTRA='-S' ;; "--dump-dts"|"--dump") # shellcheck disable=SC2086