Changeset fa024ce in mainline for boot/arch/sparc64

Timestamp:

2009-02-12T20:12:08Z (16 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/sparc64

Files:

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

boot/arch/sparc64/Makefile.inc

@@ -29 +29 @@
 TMP = distroot
 
-ifeq ($(CONFIG_AOUT_ISOFS_B),n)
-        SILO_PACKAGE=silo.patched.tar.gz
-endif
-
 ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-        SILO_PACKAGE=silo.tar.gz
+        SILO_PACKAGE = silo.tar.gz
+else
+        SILO_PACKAGE = silo.patched.tar.gz
 endif
 
 build: $(BASE)/image.iso
 
-ifeq ($(CONFIG_RD_EXTERNAL),y)
-SILO_CONF_FILTER = cat
-else
-SILO_CONF_FILTER = grep -v initrd
-endif
-
-$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
+$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
         mkdir -p $(TMP)/boot
         mkdir -p $(TMP)/HelenOS
-        cat arch/$(ARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
-        cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
-        cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
-        cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+        cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
+        cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
+ifeq ($(CONFIG_RD_EXTERNAL),y)
+        cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
+else
+        cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
+endif
+        cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
         gzip -f $(TMP)/HelenOS/image.boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-        cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+        cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
 endif
         mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
 
 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) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+        $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 
 clean: generic_clean
-        $(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+        $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
         -rm -fr $(TMP)
         -rm -f $(BASE)/image.iso

boot/arch/sparc64/loader/Makefile

@@ -28 +28 @@
 
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 
 ## Toolchain configuration
@@ -58 +58 @@
 endif
 
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
-
-ifdef REVISION
-        CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-
-ifdef TIMESTAMP
-        CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
 
 SOURCES = \

boot/arch/sparc64/loader/main.c

@@ -37 +37 @@
 #include "ofwarch.h"
 #include <align.h>
+#include <macros.h>
 #include <string.h>
 
@@ -43 +44 @@
 component_t components[COMPONENTS];
 
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        char *revision = ", revision " REVISION;
+        char *revision = ", revision " STRING(REVISION);
 #else
         char *revision = "";
@@ -52 +53 @@
 
 #ifdef TIMESTAMP
-        char *timestamp = "\nBuilt on " TIMESTAMP;
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
         char *timestamp = "";

boot/arch/sparc64/loader/ofwarch.c

@@ -33 +33 @@
  */
 
-#include <ofwarch.h>  
+#include <ofwarch.h>
 #include <ofw.h>
 #include <printf.h>