Changeset b0f00a9 in mainline for boot/Makefile.uboot


Ignore:
Timestamp:
2011-11-06T22:21:05Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (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/Makefile.uboot

    r2bdf8313 rb0f00a9  
    3131include Makefile.common
    3232
    33 IMAGE_NAME=HelenOS-$(RELEASE)
    34 BIN_OUTPUT=image.bin
     33IMAGE_NAME = HelenOS-$(RELEASE)
     34BIN_OUTPUT = image.bin
    3535
    3636all: $(POST_OUTPUT)
    … …  
    4040
    4141$(POST_OUTPUT): $(BIN_OUTPUT)
    42         $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 \
    43     $< $@
     42        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 $< $@
    4443
    4544clean:
Note: See TracChangeset for help on using the changeset viewer.