WebSVN – HelenOS – Path Comparison – / – /trunk/boot/arch/arm32/loader/ Rev 3882 and /trunk/boot/arch/arm32/loader/ Rev 3883

Ignore whitespace Rev 3882 → Rev 3883

 /trunk/boot/arch/arm32/loader/main.c
 ,10 → 35,11
  */
-#include "main.h"
+#include "main.h"
 #include "asm.h"
 #include "_components.h"
 #include <printf.h>
+#include <macros.h>
 #include "mm.h"
 ,16 → 47,16
 #define KERNEL_VIRTUAL_ADDRESS 0x80200000
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /trunk/boot/arch/arm32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,20 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
-ifdef MACHINE
-    CFLAGS += "-DMACHINE=$(MACHINE)"
-endif
 SOURCES = \
     main.c \
     boot.S \