diff --git a/kernel/Makefile b/kernel/Makefile index fd73288..ea0290c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -23,7 +23,6 @@ CFLAGS += -I. \ -DFASTLZ_USE_MEMMOVE=0 \ include arch/$(ARCH)/$(ARCH).mk -include extconf/extra.mk LDFLAGS += -nostdlib -static -T arch/$(ARCH)/link.ld $(shell $(CC) -print-libgcc-file-name) diff --git a/kernel/extconf/extra.mk b/kernel/extconf/extra.mk deleted file mode 100644 index b3fe8bc..0000000 --- a/kernel/extconf/extra.mk +++ /dev/null @@ -1 +0,0 @@ -CFLAGS += -DKPRINTF_COLORS diff --git a/kernel/kprintf.h b/kernel/kprintf.h index 53e7e39..0b68854 100644 --- a/kernel/kprintf.h +++ b/kernel/kprintf.h @@ -18,18 +18,8 @@ #define kvsnprintf vsnprintf_ #define kvprintf vprintf_ -#ifdef KPRINTF_COLORS -# include "ansi_colors.h" -# define LOG(component, fmt, ...) kprintf(CRESET "[" CYN component CRESET "]: " fmt, ##__VA_ARGS__) -#else -# define LOG(component, fmt, ...) kprintf("["component"]: "fmt, ##__VA_ARGS__) -#endif - -#ifdef KPRINTF_COLORS -# include "ansi_colors.h" -# define ERR(component, fmt, ...) kprintf(CRESET "[" RED1 component CRESET "]: " fmt, ##__VA_ARGS__) -#else -# define ERR(component, fmt, ...) kprintf("["component"]: "fmt, ##__VA_ARGS__) -#endif +#include "ansi_colors.h" +#define LOG(component, fmt, ...) kprintf(CRESET "[" CYN component CRESET "]: " fmt, ##__VA_ARGS__) +#define ERR(component, fmt, ...) kprintf(CRESET "[" RED1 component CRESET "]: " fmt, ##__VA_ARGS__) #endif // KPRINTF_H_