linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: arcboot

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: arcboot
From: ths@linux-mips.org
Date: Mon, 31 Jan 2005 21:19:59 +0000
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    arcboot
Changes by:     ths@ftp.linux-mips.org  05/01/31 21:19:53

Modified files:
        arclib         : Makefile 
        common         : Makefile version.h 
        debian         : changelog 
        tip22          : Makefile README 
Added files:
        debian/po      : da.po 

Log message:
        Add danish debconf translation. Minor makefile cleanups.

diff -urN arcboot/arclib/Makefile arcboot/arclib/Makefile
--- arcboot/arclib/Makefile     2004/11/29 10:52:21     1.3
+++ arcboot/arclib/Makefile     2005/01/31 21:19:53     1.4
@@ -1,19 +1,20 @@
 #
 # Copyright 1999 Silicon Graphics, Inc.
 #
-CFLAGS = -O2 -Werror -Wall -mno-abicalls -G 0 -fno-pic
+CFLAGS += -O2 -Werror -Wall -mno-abicalls -G 0 -fno-pic
 
+TARGETS = libarc.a
 OBJECTS = arc.o        stdio.o stdlib.o string.o
 
-all:  libarc.a
+all: $(TARGETS)
 
-libarc.a:  $(OBJECTS)
+$(TARGETS): $(OBJECTS)
        rm -f $@
-       $(AR) -cr $@ $(OBJECTS)
+       $(AR) -crs $@ $(OBJECTS)
 
-install: libarc.a
+install: $(TARGETS)
        install -d ${PREFIX}/${LIBDIR}
        install -m 644 $< ${PREFIX}/${LIBDIR}
 
 clean:
-       rm -f libarc.a $(OBJECTS)
+       rm -f libarc.a $(OBJECTS) *~ tags
diff -urN arcboot/common/Makefile arcboot/common/Makefile
--- arcboot/common/Makefile     2004/11/29 10:52:21     1.2
+++ arcboot/common/Makefile     2005/01/31 21:19:53     1.3
@@ -1,18 +1,16 @@
 SUBARCH ?= IP22
 
-CFLAGS = -Wall -O2 -I. -I../arclib -DSUBARCH=${SUBARCH}
+CFLAGS += -Wall -O2 -I. -I../arclib -DSUBARCH=${SUBARCH}
 
-TARGETS = print_loadaddr
+HOSTCC = $(CC)
+HOSTCFLAGS += -Wall -O2 -DSUBARCH=$(SUBARCH)
 
-HOSTCC=$(CC)
-HOSTCFLAGS=-Wall -O2 -DSUBARCH=$(SUBARCH)
+all: print_loadaddr
 
-all: $(TARGETS)
-
-$(TARGETS): print_loadaddr.c subarch.h
+print_loadaddr: print_loadaddr.c subarch.h version.h
        $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
-install:
+install: print_loadaddr
 
 clean:
-       rm -f $(TARGETS) *.a *.o tags
+       rm -f print_loadaddr *~ tags
diff -urN arcboot/common/version.h arcboot/common/version.h
--- arcboot/common/version.h    2004/11/29 10:52:21     1.2
+++ arcboot/common/version.h    2005/01/31 21:19:53     1.3
@@ -1 +1 @@
-#define __ARCSBOOT_VERSION__ "0.3.8.4"
+#define __ARCSBOOT_VERSION__ "0.3.8.5"
diff -urN arcboot/debian/changelog arcboot/debian/changelog
--- arcboot/debian/changelog    2004/11/29 10:39:38     1.1
+++ arcboot/debian/changelog    2005/01/31 21:19:53     1.2
@@ -1,3 +1,13 @@
+arcboot (0.3.8.5) UNRELEASED; urgency=low
+
+  * Add da debconf translation by Morten Brix Pedersen, thanks
+    (Closes: #276691).
+  * Add tip32 for IP32 machines.
+  * Rework build system.
+  * Vastly improved loader performance, thanks Keith Wesolowski.
+
+ -- Thiemo Seufer <ths@debian.org>  Mon, 31 Jan 2005 21:24:00 +0100
+
 arcboot (0.3.8.4) unstable; urgency=low
 
   * fix compilation with gcc-3.3 for tip22 also (Closes: #273951)
diff -urN arcboot/debian/po/da.po arcboot/debian/po/da.po
--- arcboot/debian/po/da.po     1970/01/01 00:00:00
+++ arcboot/debian/po/da.po     Mon Jan 31 21:19:53 2005        1.1
@@ -0,0 +1,40 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: arcboot 0.3.8.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-05 09:42+0200\n"
+"PO-Revision-Date: 2004-10-15 18:02+0200\n"
+"Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../templates:4
+msgid "Where to put arcboot?"
+msgstr "Hvor skal arcboot placeres?"
+
+#. Description
+#: ../templates:4
+msgid ""
+"Arcboot must be put into the volume header of a disk with a SGI disklabel. "
+"Usually the volume header of /dev/sda is used. Please give the device name "
+"of the disk you want to put arcboot onto."
+msgstr ""
+"Arcoot skal placeres i 'volume' hovedet af en disk med et SGI-diskmærke. "
+"Normalt er 'volume' hovedet på /dev/sda brugt. Angiv enhedsnavnet på den "
+"disk du gerne vil placere arcboot på."
diff -urN arcboot/tip22/Makefile arcboot/tip22/Makefile
--- arcboot/tip22/Makefile      2004/11/29 10:52:21     1.2
+++ arcboot/tip22/Makefile      2005/01/31 21:19:53     1.3
@@ -2,52 +2,62 @@
 # Copyright 2002-2004 Guido Guenther <agx@sigxcpu.org>
 #
 
-OBJECTS = tftpload.$(SUBARCH).o
-
 ARCLIBDIR = ../arclib
 ARCLIB = $(ARCLIBDIR)/libarc.a
 
 COMMONDIR = ../common
+PRINT_LOADADDR = $(COMMONDIR)/print_loadaddr
+PRINT_OUTPUTFORMAT = $(COMMONDIR)/print_outputformat
 
-CFLAGS = -O2 -I $(COMMONDIR) -I$(ARCLIBDIR) \
-         -Wall -mno-abicalls -G 0 -fno-pic \
-        -DSUBARCH=${SUBARCH}
+CFLAGS += -O2 -I$(COMMONDIR) -I$(ARCLIBDIR) -Wall -mno-abicalls -G 0 \
+       -fno-pic -DSUBARCH=${SUBARCH}
 
 ASFLAGS = -O2 -mno-abicalls -G 0 -fno-pic
 
 LIBDIR ?= /usr/lib/tip22
 BINDIR ?= /usr/sbin
+
 LIBS=${ARCLIB}
 BINS=tip22 tip32
 LD_SCRIPTS = ld.kernel.script.$(SUBARCH) ld.ramdisk.script.$(SUBARCH) 
ld.script.$(SUBARCH)
-
+OBJECTS = tftpload.$(SUBARCH).o
 TARGETS = $(OBJECTS) $(LD_SCRIPTS)
 
 # uncomment for debugging
 #CFLAGS+=-DDEBUG
 
+
 all: ${LIBS} ${BINS}
        @$(MAKE) SUBARCH=IP32 archall
        @$(MAKE) SUBARCH=IP22 archall
 
 archall: $(TARGETS)
 
+
+$(ARCLIB):
+       @$(MAKE) -C $(ARCLIBDIR)
+
+$(PRINT_LOADADDR):
+       @$(MAKE) -C $(COMMONDIR) SUBARCH=$(SUBARCH)
+
+
 %.$(SUBARCH).o: %.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
-%.script.$(SUBARCH): %.script.in
-       $(MAKE) -C ../common SUBARCH=$(SUBARCH) print_loadaddr
-       LOADADDR=$$(../common/print_loadaddr $(SUBARCH));               \
-       OUTPUTFORMAT=$$(../common/print_outputformat $(SUBARCH));       \
-       sed -e "s/@@LOADADDR@@/$$LOADADDR/"                             \
+%.script.$(SUBARCH): %.script.in $(PRINT_LOADADDR) $(PRINT_OUTPUTFORMAT)
+       LOADADDR=$$($(PRINT_LOADADDR) $(SUBARCH));              \
+       OUTPUTFORMAT=$$($(PRINT_OUTPUTFORMAT) $(SUBARCH));      \
+       sed -e "s/@@LOADADDR@@/$$LOADADDR/"                     \
        -e "s/@@OUTPUTFORMAT@@/$$OUTPUTFORMAT/" <$< >$@
 
 clean:
        @$(MAKE) SUBARCH=IP32 archclean
        @$(MAKE) SUBARCH=IP22 archclean
-       rm -f *.a *.o tags
+       rm -f tags *~
 
 archclean:
+       @$(MAKE) -C $(ARCLIBDIR) clean
+       @$(MAKE) -C $(COMMONDIR) clean
        rm -f $(TARGETS)
 
 install: all
diff -urN arcboot/tip22/README arcboot/tip22/README
--- arcboot/tip22/README        2004/11/29 10:39:38     1.1
+++ arcboot/tip22/README        2005/01/31 21:19:53     1.2
@@ -1,27 +1,32 @@
-How to create the ecoff boot image:
+How to create the boot image:
 -----------------------------------
 
 tip22 <vmlinux> <initrd> <outputfile>
+tip32 <vmlinux> <initrd> <outputfile>
 
-- vmlinux is an ELF Linux kernel. You currently need to apply an extra 
-  patch for correct commandline parsing (see /usr/share/doc/tip22/examples)
+- vmlinux is an ELF Linux kernel. For versions before 2.6.9 you need to
+  apply an extra patch for correct commandline parsing, see
+  /usr/share/doc/tip22/examples.
 - initrd is the gzip compressed initial ramdisk you want add
-- outputfile is the ECOFF bootimage. You can for example tfpboot this image on
-  an SGI Indy using the bootp(): command in the prom.
+- outputfile is the bootimage. It is in ECOFF format for ip22 and in
+  ELF format for ip32. You can for example tfpboot this image on an SGI
+  Indy using the bootp(): command in the prom.
 
 it basically works like this:
 -----------------------------
 - tftpload.o is a relocatable object created during package build time
-- the tip22 script converts the ramdisk and vmlinux to ecoff relocatable 
objects
-  using linker scripts including symbols that mark the beginning and end of
-  kernel and ramdisk
-- those are linked together into the output file using yet another linker 
script
+- the tip22 script converts the ramdisk and vmlinux to relocatable
+  objects using linker scripts including symbols that mark the begin
+  and the end of kernel and ramdisk
+- those are linked together into the output file using yet another
+  linker script
 - when executed by the prom the embedded loader:
    - memcopies the kernel to its loadaddress
    - memcopies the initrd after the kernel to a page boundary
-   - parses the command line and everything within an append="..." statement 
is passed on
-     to the kernel, e.g. 'bootp(): append="console=ttyS0"'
-   - jumps into the kernel passing the start address and size of the initrd on 
the
-     command line
+   - parses the command line and everything within an append="..."
+     statement is passed on to the kernel, e.g.
+     'bootp(): append="console=ttyS0"'
+   - jumps into the kernel passing the start address and size of the
+     initrd on the command line
 
  -- Thu,  15 May 2002 23:07:18 +0200 Guido Guenther <agx@sigxcpu.org>

<Prev in Thread] Current Thread [Next in Thread>
  • CVS Update@linux-mips.org: arcboot, ths <=