ETRAX: Correct passing of kernel command line.
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>
Fri, 15 May 2009 14:53:53 +0000 (16:53 +0200)
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>
Fri, 15 May 2009 14:53:53 +0000 (16:53 +0200)
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

hw/axis_dev88.c
hw/etraxfs.c

index 098c275..8df536d 100644 (file)
@@ -350,10 +350,10 @@ void axisdev88_init (ram_addr_t ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;
index 56cb249..ad82132 100644 (file)
@@ -141,10 +141,10 @@ void bareetraxfs_init (ram_addr_t ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;