Changeset 6bc4dbd in mainline for arch/ppc32

Timestamp:

2005-11-08T00:00:15Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5b65205

Parents:

849ba5cb

Message:

new build system upgrade
finished work for IA-32, IA-64, PPC-32, SPARC-64

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (moved) (moved from arch/ppc32/_link.ld ) (3 diffs)
• boot/Makefile (modified) (2 diffs)

arch/ppc32/Makefile.inc

@@ -1 @@
-PPC_TARGET=ppc-linux-gnu
+#
+# Copyright (C) 2005 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 
-PPC_CC_DIR=/usr/local/ppc/bin
-PPC_BINUTILS_DIR=/usr/local/ppc/bin
+## Toolchain configuration
+#
 
-CC=$(PPC_CC_DIR)/$(PPC_TARGET)-gcc
-AS=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-as
-LD=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-ld
-OBJDUMP=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-objdump
-OBJCOPY=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-objcopy
-BFD_NAME=elf32-powerpc
-BFD_ARCH=powerpc
+BFD_NAME = elf32-powerpc
+BFD_ARCH = powerpc
+TARGET = ppc-linux-gnu
+TOOLCHAIN_DIR = /usr/local/ppc/bin
 
-ASFLAGS=
+## Make some default assumptions
+#
 
-DEFS=-DARCH=$(ARCH)
-CFLAGS=$(DEFS) -nostdlib -fno-builtin -O2
-LFLAGS=-M -no-check-sections -N
+LFLAGS += -no-check-sections -N
 
-arch_sources= \
-        generic/src/arch/console.c \
-        generic/src/arch/context.S \
-        generic/src/arch/debug/panic.s \
-        generic/src/arch/fpu_context.c \
-        generic/src/arch/ppc32.c \
-        generic/src/arch/dummy.s \
-        generic/src/arch/start.S \
-        generic/src/arch/asm.S \
-        generic/src/arch/cpu/cpu.c \
-        generic/src/arch/mm/frame.c \
-        generic/src/arch/mm/memory_init.c \
-        generic/src/arch/mm/page.c \
-        generic/src/arch/fmath.c
+## Own configuration directives
+#
+
+CONFIG_OFW = y
+
+ARCH_SOURCES = \
+        arch/$(ARCH)/src/console.c \
+        arch/$(ARCH)/src/context.S \
+        arch/$(ARCH)/src/debug/panic.s \
+        arch/$(ARCH)/src/fpu_context.c \
+        arch/$(ARCH)/src/ppc32.c \
+        arch/$(ARCH)/src/dummy.s \
+        arch/$(ARCH)/src/start.S \
+        arch/$(ARCH)/src/asm.S \
+        arch/$(ARCH)/src/cpu/cpu.c \
+        arch/$(ARCH)/src/mm/frame.c \
+        arch/$(ARCH)/src/mm/memory_init.c \
+        arch/$(ARCH)/src/mm/page.c \
+        arch/$(ARCH)/src/fmath.c

arch/ppc32/_link.ld.in

@@ -1 @@
-/*
- *  PPC32 linker script
+/** PPC32 linker script
  *
  *  It is ELF format, but its only section looks like this:
@@ -8 +7 @@
  */
 
-OUTPUT_FORMAT(elf32-powerpc)
+#define __ASM__
+
+OUTPUT_FORMAT("elf32-powerpc")
 ENTRY(kernel_image_start)
 
@@ -36 +37 @@
 
                 symbol_table = .;
-                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
 
                 kdata_end = .;

arch/ppc32/boot/Makefile

@@ -1 @@
-PPC_BINUTILS_DIR=/usr/local/ppc/bin
-PPC_TARGET=ppc-linux-gnu
+.PHONY: build clean
 
-.PHONY: nothing build
-
-nothing:
+CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -I../include
 
 build: boot.bin
         cp boot.bin ../../../load.bin
 
-CC=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-gcc
-AS=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-as
-LD=$(PPC_BINUTILS_DIR)/$(PPC_TARGET)-ld
-
-CPPFLAGS=$(DEFS) -nostdinc -I../include
-CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O2
-LFLAGS=-no-check-sections -N -T _link.ld
-
 boot.bin: boot.o main.o
-        $(LD) $(LFLAGS) boot.o main.o -o $@
+        $(LD) -no-check-sections -N -T _link.ld boot.o main.o -o $@
 
 boot.o: boot.S
@@ -27 +16 @@
 
 clean:
-        -rm *.o *.bin
+        -rm -f boot.o main.o boot.bin ../../../load.bin