WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-ppc-devel

[XenPPC] [pushed] [ppc] fix make issues with papr and of_handler

To: xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
Subject: [XenPPC] [pushed] [ppc] fix make issues with papr and of_handler
From: jimix@xxxxxxxxxxxxxx
Date: Thu, 30 Mar 2006 16:03:01 -0500
Delivery-date: Thu, 30 Mar 2006 21:02:33 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ppc-devel-request@lists.xensource.com?subject=help>
List-id: Xen PPC development <xen-ppc-devel.lists.xensource.com>
List-post: <mailto:xen-ppc-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ppc-devel>, <mailto:xen-ppc-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-ppc-devel-bounces@xxxxxxxxxxxxxxxxxxx
changeset:   9711:da218291a2787cd8a141e9c8fa47bfd2f4ed13e4
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Thu Mar 30 14:35:43 2006 -0500
files:       .hgignore xen/arch/ppc/Makefile xen/arch/ppc/of_handler/Makefile 
xen/arch/ppc/papr/Makefile
description:
[ppc] fix make issues with papr and of_handler


diff -r b2962e6543a515b23ba61cc058ff147b97451f53 -r 
da218291a2787cd8a141e9c8fa47bfd2f4ed13e4 .hgignore
--- a/.hgignore Thu Mar 30 14:34:17 2006 -0500
+++ b/.hgignore Thu Mar 30 14:35:43 2006 -0500
@@ -207,6 +207,6 @@ cscope\..*$
 ^xen/cscope\..*$
 ^xen/arch/ppc/dom0\.bin$
 ^xen/arch/ppc/asm-offsets\.s$
-^xen/arch/ppc/of_handler/ofh_image\.bin$
-^xen/arch/ppc/of_handler/ofh\.syms$
-^xen/arch/ppc/of_handler/ofh\.dbg$
+^xen/arch/ppc/of_handler/ofh_image$
+^xen/arch/ppc/of_handler/of_handler$
+^xen/arch/ppc/of_handler/of_handler\.dbg$
diff -r b2962e6543a515b23ba61cc058ff147b97451f53 -r 
da218291a2787cd8a141e9c8fa47bfd2f4ed13e4 xen/arch/ppc/Makefile
--- a/xen/arch/ppc/Makefile     Thu Mar 30 14:34:17 2006 -0500
+++ b/xen/arch/ppc/Makefile     Thu Mar 30 14:35:43 2006 -0500
@@ -5,6 +5,7 @@ endif
 endif
 
 subdir-$(HAS_PPC64) += ppc64
+subdir-y += papr
 
 obj-y += audit.o
 obj-y += bitops.o
@@ -36,13 +37,6 @@ obj-y += time.o
 obj-y += time.o
 obj-y += usercopy.o
 
-# PAPR support
-obj-y += papr/debug.o
-obj-y += papr/tce.o
-obj-y += papr/vtce.o
-obj-$(papr_vterm) += papr/vterm.o
-obj-y += papr/xlate.o
-
 obj-$(debug) += 0opt.o
 obj-$(crash_debug) += gdbstub.o
 obj-$(builtin_dom0) += dom0.o
@@ -56,9 +50,6 @@ include $(BASEDIR)/Post.mk
 #
 irq.o: ../x86/irq.c
 physdev.o: ../x86/physdev.c
-
-of_handler/ofh_image.o:
-       $(MAKE) -C of_handler ofh_image.o
 
 start.o: boot/start.S
        $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
@@ -88,3 +79,9 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-off
 
 dom0.bin: $(DOM0_IMAGE)
        cp $< $@
+
+of_handler/ofh_image.o: FORCE
+       $(MAKE) -C of_handler ofh_image.o
+
+clean::
+       $(MAKE) -C of_handler clean
\ No newline at end of file
diff -r b2962e6543a515b23ba61cc058ff147b97451f53 -r 
da218291a2787cd8a141e9c8fa47bfd2f4ed13e4 xen/arch/ppc/of_handler/Makefile
--- a/xen/arch/ppc/of_handler/Makefile  Thu Mar 30 14:34:17 2006 -0500
+++ b/xen/arch/ppc/of_handler/Makefile  Thu Mar 30 14:35:43 2006 -0500
@@ -4,10 +4,10 @@
 
 include $(BASEDIR)/Rules.mk
 
-default: ofh_image.o
+default: of_image.o
 
 # head.o must be first
-obj-y += head.o
+obj-y = head.o
 obj-y += console.o
 obj-y += control.o
 obj-y += cpu.o
@@ -38,11 +38,22 @@ obj-y += ../of-devtree.o
 
 include $(BASEDIR)/Post.mk
 
-ofh.dbg: built_in.o
-       $(LD) $(LDFLAGS) -N -Ttext=0x02000000 $< -o $@
+of_handler.dbg: $(obj-y)
+       $(LD) $(LDFLAGS) -N -Ttext=0x02000000 $^ -o $@
 
-ofh.syms: built_in.o
-       $(LD) $(LDFLAGS) -N -Ttext=0x0 $< -o $@
+of_handler: $(obj-y)
+       $(LD) $(LDFLAGS) -N -Ttext=0x0 $^ -o $@
 
-ofh_image.bin: ofh.syms
+ofh_image: of_handler of_handler.dbg
        $(CROSS_COMPILE)objcopy --output-target=binary $< $@
+
+ofh_image.o: ofh_image
+       $(CROSS_COMPILE)objcopy --input-target=binary \
+               --output-target=elf64-powerpc \
+               --binary-architecture=powerpc \
+               --redefine-sym _binary_$<_start=$(@:%.o=%)_start \
+               --redefine-sym _binary_$<_end=$(@:%.o=%)_end \
+               --redefine-sym _binary_$<_size=$(@:%.o=%)_size  $< $@
+
+clean::
+       rm -f ofh_image.o ofh_image ofh_image of_handler of_handler.dbg
\ No newline at end of file
diff -r b2962e6543a515b23ba61cc058ff147b97451f53 -r 
da218291a2787cd8a141e9c8fa47bfd2f4ed13e4 xen/arch/ppc/papr/Makefile
--- /dev/null   Thu Jan  1 00:00:00 1970 +0000
+++ b/xen/arch/ppc/papr/Makefile        Thu Mar 30 14:35:43 2006 -0500
@@ -0,0 +1,17 @@
+#
+# Build the Open Firmware handler
+#
+
+include $(BASEDIR)/Rules.mk
+
+default: built_in.o
+
+# PAPR support
+obj-y += debug.o
+obj-y += tce.o
+obj-y += vtce.o
+obj-$(papr_vterm) += vterm.o
+obj-y += xlate.o
+
+include $(BASEDIR)/Post.mk
+



_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel

<Prev in Thread] Current Thread [Next in Thread>