Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/arch/sparc64/Makefile.inc


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/Makefile.inc

    r6c39a907 r25a76ab8  
    2727#
    2828
    29 include Makefile.common
     29BOOT_OUTPUT = image.boot
     30POST_OUTPUT = $(ROOT_PATH)/image.iso
     31POSTBUILD = Makefile.silo
    3032
    31 ifeq ($(CONFIG_AOUT_ISOFS_B),y)
    32         SILO_PACKAGE = silo.tar.gz
    33 else
    34         SILO_PACKAGE = silo.patched.tar.gz
    35 endif
     33BFD_NAME = elf64-sparc
     34BFD_OUTPUT = $(BFD_NAME)
     35BFD_ARCH = sparc
    3636
    37 build: $(BASE)/image.iso
     37BITS = 64
     38ENDIANESS = BE
     39PAGE_SIZE = 16384
     40EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu
    3841
    39 $(BASE)/image.iso: arch/$(BARCH)/loader/image.boot
    40         mkdir -p $(TMP)/boot
    41         mkdir -p $(TMP)/HelenOS
    42         cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
    43         cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
    44 ifeq ($(CONFIG_RD_EXTERNAL),y)
    45         cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
    46 else
    47         cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
    48 endif
    49         cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
    50         gzip -f $(TMP)/HelenOS/image.boot
    51 ifeq ($(CONFIG_RD_EXTERNAL),y)
    52         cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
    53 endif
    54         mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
     42RD_SRVS += \
     43        $(USPACE_PATH)/srv/hw/cir/fhc/fhc \
     44        $(USPACE_PATH)/srv/hw/cir/obio/obio
    5545
    56 arch/$(BARCH)/loader/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
    57         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    58 
    59 clean: generic_clean
    60         $(MAKE) -C arch/$(BARCH)/loader clean
    61         rm -fr $(TMP)
    62         rm -f $(BASE)/image.iso
     46SOURCES = \
     47        arch/$(BARCH)/src/asm.S \
     48        arch/$(BARCH)/src/main.c \
     49        arch/$(BARCH)/src/ofw.c \
     50        $(COMPS_C) \
     51        genarch/src/ofw.c \
     52        genarch/src/ofw_tree.c \
     53        generic/src/balloc.c \
     54        generic/src/printf_core.c \
     55        generic/src/vprintf.c \
     56        generic/src/printf.c \
     57        generic/src/str.c \
     58        generic/src/version.c \
     59        generic/src/inflate.c
Note: See TracChangeset for help on using the changeset viewer.