Changeset fa024ce in mainline for boot/arch/arm32

Timestamp:

2009-02-12T20:12:08Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98a4e76

Parents:

fcd7053

Message:

simplify configuration

Location:

boot/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• loader/Makefile (modified) (2 diffs)
• loader/main.c (modified) (3 diffs)

boot/arch/arm32/Makefile.inc

@@ -29 +29 @@
 build: $(BASE)/image.boot
 
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-        cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+        cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 
 depend:
-        -rm arch/$(ARCH)/loader/image.boot
+        -rm arch/$(BARCH)/loader/image.boot
 
-arch/$(ARCH)/loader/image.boot:
-        make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+arch/$(BARCH)/loader/image.boot:
+        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 
 clean:
-        make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+        make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
         -rm -f $(BASE)/image.boot

boot/arch/arm32/loader/Makefile

@@ -28 +28 @@
 
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 
 ## Toolchain configuration
@@ -58 +58 @@
 endif
 
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -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
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
 
 SOURCES = \

boot/arch/arm32/loader/main.c

@@ -36 +36 @@
 
 
-#include "main.h" 
+#include "main.h"
 #include "asm.h"
 #include "_components.h"
 #include <printf.h>
+#include <macros.h>
 
 #include "mm.h"
@@ -47 +48 @@
 
 
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        char *revision = ", revision " REVISION;
+        char *revision = ", revision " STRING(REVISION);
 #else
         char *revision = "";
@@ -56 +57 @@
 
 #ifdef TIMESTAMP
-        char *timestamp = "\nBuilt on " TIMESTAMP;
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
         char *timestamp = "";