gwj / at91sam9263 · Commits

Commit d33fd9d14b97731721e70bbb500ebc33c9e3a6ef

Authored by Edgar E. Iglesias
1 parent 21aeb343

ETRAX: Correct passing of kernel command line. 

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
hw/axis_dev88.c
  View file @d33fd9d
@@ -350,10 +350,10 @@ void axisdev88_init (ram_addr_t ram_size, @@ -350,10 +350,10 @@ void axisdev88_init (ram_addr_t ram_size,
350 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n"); 350 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
351 exit(1); 351 exit(1);
352 } 352 }
353 - pstrcpy_targphys(high, 256, kernel_cmdline);  
354 /* Let the kernel know we are modifying the cmdline. */ 353 /* Let the kernel know we are modifying the cmdline. */
355 env->regs[10] = 0x87109563; 354 env->regs[10] = 0x87109563;
356 - env->regs[11] = high; 355 + env->regs[11] = 0x40000000;
  356 + pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
357 } 357 }
358 } 358 }
359 env->pc = bootstrap_pc; 359 env->pc = bootstrap_pc;
hw/etraxfs.c
  View file @d33fd9d
@@ -141,10 +141,10 @@ void bareetraxfs_init (ram_addr_t ram_size, @@ -141,10 +141,10 @@ void bareetraxfs_init (ram_addr_t ram_size,
141 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n"); 141 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
142 exit(1); 142 exit(1);
143 } 143 }
144 - pstrcpy_targphys(high, 256, kernel_cmdline);  
145 /* Let the kernel know we are modifying the cmdline. */ 144 /* Let the kernel know we are modifying the cmdline. */
146 env->regs[10] = 0x87109563; 145 env->regs[10] = 0x87109563;
147 - env->regs[11] = high; 146 + env->regs[11] = 0x40000000;
  147 + pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
148 } 148 }
149 } 149 }
150 env->pc = bootstrap_pc; 150 env->pc = bootstrap_pc;