summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-11-12 22:21:39 +0100
committerMichal Idziorek <m.i@gmx.at>2014-11-12 22:21:39 +0100
commita549edf976ba9a79744cc09fb41798f91153089a (patch)
treead83996d8d0a6c07a8466fa10a9d2b98b9f59ce9
parentf3fc47d50e4d840371c02bb0300b79e122fca842 (diff)
minor cleanup
-rw-r--r--Makefile23
1 files changed, 11 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index cd7ed53..a45059c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,10 @@
# #
#####################
-
-############ phony targets ############
-
-.PHONY: all clean run stick new newrun
-
-
############ some constants ############
-USB_STICK=/dev/sdf #take care!
+#take care to set this properly!
+USB_STICK=/dev/sdf
#here our kernel will be loaded by the bootloader.
KERNEL_START=0x100000
@@ -21,12 +16,17 @@ KERNEL_START=0x100000
#use our cross compiler
CC=i686-elf-gcc
-############ flags ############
+############ compiler flags ############
-CFLAGS=-ffreestanding -nostdlib -lgcc -std=gnu11
+CFLAGS=
+CFLAGS+=-ffreestanding
+CFLAGS+=-nostdlib
+CFLAGS+=-std=gnu11
CFLAGS+= -I.
-CFLAGS+= -Wno-implicit-function-declaration
-#CFLAGS+= -O0
+
+#CFLAGS+=-lgcc
+#CFLAGS+= -Wno-implicit-function-declaration
+#CFLAGS+= -O4
#CFLAGS+=-fdata-sections -ffunction-sections
#CFLAGS+= -Werror
@@ -80,7 +80,6 @@ newrun: clean run
# the kernel_entry.o needs to be FIRST!!
kernel.bin: $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS)
$(CC) $(CFLAGS) -o $@ -Wl,-Ttext,$(KERNEL_START),--oformat,binary $^
- #ld -o $@ -Ttext $(KERNEL_START) --oformat binary -melf_i386 $^ -O0 # --gc-sections --entry=kernel_main -v
############ fool-font ############