[Qemu-devel] [6960] SH4: Add support for kernel cmdline

[Qemu-devel] [6960] SH4: Add support for kernel cmdline

[Aurelien Jarno]

Revision: 6960
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6960
Author:   aurel32
Date:     2009-03-31 05:55:16 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
SH4: Add support for kernel cmdline

Backport of revisions 6792, 6916, 6919 from trunk.

Modified Paths:
--------------
    branches/stable_0_10/hw/r2d.c
    branches/stable_0_10/loader.c

Modified: branches/stable_0_10/hw/r2d.c
===================================================================
--- branches/stable_0_10/hw/r2d.c	2009-03-30 17:51:29 UTC (rev 6959)
+++ branches/stable_0_10/hw/r2d.c	2009-03-31 05:55:16 UTC (rev 6960)
@@ -37,6 +37,9 @@
 
 #define SM501_VRAM_SIZE 0x800000
 
+/* CONFIG_BOOT_LINK_OFFSET of Linux kernel */
+#define LINUX_LOAD_OFFSET 0x800000
+
 #define PA_IRLMSK	0x00
 #define PA_POWOFF	0x30
 #define PA_VERREG	0x32
@@ -233,20 +236,27 @@
         pci_nic_init(pci, &nd_table[i], (i==0)? 2<<3: -1, "rtl8139");
 
     /* Todo: register on board registers */
-    {
+    if (kernel_filename) {
       int kernel_size;
       /* initialization which should be done by firmware */
       stl_phys(SH7750_BCR1, 1<<3); /* cs3 SDRAM */
       stw_phys(SH7750_BCR2, 3<<(3*2)); /* cs3 32bit */
 
-      kernel_size = load_image(kernel_filename, phys_ram_base);
+      if (kernel_cmdline) {
+          kernel_size = load_image_targphys(kernel_filename,
+				   SDRAM_BASE + LINUX_LOAD_OFFSET,
+				   SDRAM_SIZE - LINUX_LOAD_OFFSET);
+          env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000;
+          pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline);
+      } else {
+          kernel_size = load_image_targphys(kernel_filename, SDRAM_BASE, SDRAM_SIZE);
+          env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
+      }
 
       if (kernel_size < 0) {
         fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
         exit(1);
       }
-
-      env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */
     }
 }
 

Modified: branches/stable_0_10/loader.c
===================================================================
--- branches/stable_0_10/loader.c	2009-03-30 17:51:29 UTC (rev 6959)
+++ branches/stable_0_10/loader.c	2009-03-31 05:55:16 UTC (rev 6960)
@@ -90,11 +90,12 @@
     while (nbytes) {
 	want = nbytes > sizeof(buf) ? sizeof(buf) : nbytes;
 	did = fread(buf, 1, want, f);
-	if (did != want) break;
 
 	cpu_physical_memory_write_rom(dst_addr, buf, did);
 	dst_addr += did;
 	nbytes -= did;
+	if (did != want)
+	    break;
     }
     return dst_addr - dst_begin;
 }