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

Changeset 25a76ab8 in mainline for boot/arch/ppc32/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/ppc32/Makefile.inc

    r6c39a907 r25a76ab8  
    2727#
    2828
    29 include Makefile.common
     29BOOT_OUTPUT = image.boot
     30POST_OUTPUT = $(ROOT_PATH)/image.iso
     31POSTBUILD = Makefile.yaboot
    3032
    31 build: $(BASE)/image.iso
     33BFD_NAME = elf32-powerpc
     34BFD_OUTPUT = $(BFD_NAME)
     35BFD_ARCH = powerpc:common
    3236
    33 $(BASE)/image.iso: arch/$(BARCH)/loader/image.boot
    34         mkdir -p $(TMP)/boot
    35         mkdir -p $(TMP)/ppc
    36         cp arch/$(BARCH)/loader/image.boot $(TMP)/boot/image.boot
    37         cp arch/$(BARCH)/yaboot/ofboot.b $(TMP)/boot/ofboot.b
    38         cp arch/$(BARCH)/yaboot/bootinfo.txt $(TMP)/ppc/bootinfo.txt
    39         cp arch/$(BARCH)/yaboot/yaboot $(TMP)/boot/yaboot
    40         cp arch/$(BARCH)/yaboot/yaboot.conf $(TMP)/boot/yaboot.conf
    41         mkisofs -hfs -part -map arch/$(BARCH)/yaboot/maps -no-desktop -hfs-volid "HelenOS" -hfs-bless $(TMP)/boot -r -o $@ $(TMP)/
     37BITS = 32
     38ENDIANESS = BE
     39PAGE_SIZE = 4096
     40EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
    4241
    43 arch/$(BARCH)/loader/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
    44         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
     42RD_SRVS += \
     43        $(USPACE_PATH)/srv/hid/adb_mouse/adb_ms \
     44        $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
    4545
    46 clean: generic_clean
    47         $(MAKE) -C arch/$(BARCH)/loader clean
    48         rm -fr $(TMP)
    49         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        genarch/src/division.c \
     54        genarch/src/multiplication.c \
     55        generic/src/balloc.c \
     56        generic/src/printf_core.c \
     57        generic/src/vprintf.c \
     58        generic/src/printf.c \
     59        generic/src/str.c \
     60        generic/src/version.c \
     61        generic/src/inflate.c
Note: See TracChangeset for help on using the changeset viewer.