Changeset 46c20c8 in mainline for boot/Makefile.uboot

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:

• boot/Makefile.uboot (moved) (moved from boot/arch/arm32/loader/Makefile.common ) (2 diffs)

boot/Makefile.uboot

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2010 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
+.PHONY: all clean
 
-## Common names
-#
+include Makefile.common
 
-include ../../../Makefile.common
+IMAGE_NAME=HelenOS-$(RELEASE)
+BIN_OUTPUT=image.bin
 
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
-JOB = image.job
-OUTPUT = image.boot
+all: $(POST_OUTPUT)
 
-LINK = _link.ld
-COMPS = _components
+$(BIN_OUTPUT): $(BOOT_OUTPUT)
+        $(OBJCOPY) -O binary $< $@
 
-KERNELDIR = ../../../../kernel
-USPACEDIR = ../../../../uspace
+$(POST_OUTPUT): $(BIN_OUTPUT)
+        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 \
+    $< $@
 
-RD_SRVS += $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
+clean:
+        rm -f $(BIN_OUTPUT)