Author: laurent Date: 2009-01-13 21:02:40 +0100 (Tue, 13 Jan 2009) New Revision: 404
Modified: openbios-devel/arch/ppc/qemu/main.c Log: use the kernel arguments when using -kernel-append (Aurelien Jarno)
Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-13 19:54:29 UTC (rev 403) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:02:40 UTC (rev 404) @@ -364,18 +364,24 @@
static void check_preloaded_kernel(void) { - unsigned long kernel_image, kernel_size, cmdline; + unsigned long kernel_image, kernel_size; unsigned long initrd_image, initrd_size; + unsigned long cmdline, cmdline_len;
kernel_size = nvram_read_be32(0x3c); if (kernel_size) { kernel_image = nvram_read_be32(0x38); cmdline = nvram_read_be32(0x40); + cmdline_len = nvram_read_be32(0x44); initrd_image = nvram_read_be32(0x48); initrd_size = nvram_read_be32(0x4c); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " "(initrd 0x%8.8lx + 0x%8.8lx)\n", kernel_image, kernel_size, initrd_image, initrd_size); + if (cmdline_len > 0) { + phandle_t ph = find_dev("/chosen"); + set_property(ph, "bootargs", strdup((char *)cmdline), cmdline_len + 1); + } call_elf(initrd_image, initrd_size, kernel_image); } }