# HG changeset patch
# User Hollis Blanchard <[EMAIL PROTECTED]>
# Node ID 44dd4a836bfc9fa5ce142d3c39c717c8d6a759ad
# Parent  c3a10094bfae99139c96aac904116ea54ecbe069
[POWERPC] add support for builtin command line
Support expressing Xen command line arguments at make invocation.  Use
same section name as Linux's zImage and reserve a certain amount of
space so that arguments can be manipulated by external tools.

Signed-off-by: Amos Waterland <[EMAIL PROTECTED]>
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
---
 xen/arch/powerpc/Makefile  |    3 +++
 xen/arch/powerpc/boot_of.c |    8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff -r c3a10094bfae -r 44dd4a836bfc xen/arch/powerpc/Makefile
--- a/xen/arch/powerpc/Makefile Fri Aug 04 17:26:27 2006 -0400
+++ b/xen/arch/powerpc/Makefile Mon Aug 07 17:16:18 2006 -0500
@@ -83,6 +83,9 @@ physdev.o: ../x86/physdev.c
 
 HDRS += $(wildcard *.h)
 
+CMDLINE = "xen"
+boot_of.o: CFLAGS += -DCMDLINE="\"$(CMDLINE)\""
+
 start.o: boot/start.S
        $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
 
diff -r c3a10094bfae -r 44dd4a836bfc xen/arch/powerpc/boot_of.c
--- a/xen/arch/powerpc/boot_of.c        Fri Aug 04 17:26:27 2006 -0400
+++ b/xen/arch/powerpc/boot_of.c        Mon Aug 07 17:16:18 2006 -0500
@@ -36,6 +36,10 @@ static int of_out;
 static int of_out;
 static ofdn_t boot_cpu;
 static char bootargs[256];
+
+#define COMMAND_LINE_SIZE 512
+static char builtin_cmdline[COMMAND_LINE_SIZE]
+    __attribute__((section("__builtin_cmdline"))) = CMDLINE;
 
 extern struct ns16550_defaults ns16550;
 
@@ -449,8 +453,8 @@ static void boot_of_bootargs(multiboot_i
     int rc;
 
     rc = of_getprop(bof_chosen, "bootargs", &bootargs, sizeof (bootargs));
-    if (rc == OF_FAILURE) {
-        strcpy(bootargs, "xen");
+    if (rc == OF_FAILURE || bootargs[0] == '\0') {
+        strlcpy(bootargs, builtin_cmdline, sizeof(bootargs));
     }
 
     mbi->flags |= MBI_CMDLINE;

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

Reply via email to