Changeset 46c20c8 in mainline for boot/Makefile.yaboot


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile.yaboot

    rfb150d78 r46c20c8  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
     29.PHONY: all build_dist clean
    3130
    32 TARGET = ppc-linux-gnu
    33 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
     31include Makefile.common
    3432
    35 ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
    36         arch/$(UARCH)/src/fibril.S \
    37         arch/$(UARCH)/src/tls.c \
    38         arch/$(UARCH)/src/stacktrace.c \
    39         arch/$(UARCH)/src/stacktrace_asm.S
     33OFBOOT = yaboot/ofboot.b
     34BOOTINFO = yaboot/bootinfo.txt
     35YABOOT = yaboot/yaboot
     36YABOOT_CONF = yaboot/yaboot.conf
     37MAPS = yaboot/maps
    4038
    41 GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32
    42 AFLAGS += -a32
    43 LFLAGS += -N
     39all: $(POST_OUTPUT)
    4440
    45 ENDIANESS = BE
     41$(POST_OUTPUT): build_dist
     42        mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
    4643
    47 BFD_NAME = elf32-powerpc
    48 BFD_ARCH = powerpc:common
     44build_dist: clean
     45        mkdir -p $(DISTROOT)/boot
     46        mkdir -p $(DISTROOT)/ppc
     47        cp $(BOOT_OUTPUT) $(DISTROOT)/boot/
     48        cp $(OFBOOT) $(DISTROOT)/boot/
     49        cp $(BOOTINFO) $(DISTROOT)/ppc/
     50        cp $(YABOOT) $(DISTROOT)/boot/
     51        cp $(YABOOT_CONF) $(DISTROOT)/boot/
     52
     53clean:
     54        rm -fr $(DISTROOT)
Note: See TracChangeset for help on using the changeset viewer.